From 13734288dbc63c48af0b8f75f0453f0d30b750a7 Mon Sep 17 00:00:00 2001
From: Max Audron <audron@cocaine.farm>
Date: Sat, 2 Jan 2021 19:57:06 +0100
Subject: rework handshakemessage parsing

---
 src/message/handshake/clientloginreject.rs | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'src/message/handshake/clientloginreject.rs')

diff --git a/src/message/handshake/clientloginreject.rs b/src/message/handshake/clientloginreject.rs
index e8380d6..0c0fc85 100644
--- a/src/message/handshake/clientloginreject.rs
+++ b/src/message/handshake/clientloginreject.rs
@@ -1,14 +1,13 @@
-use crate::error::ProtocolError;
 use crate::primitive::{Variant, VariantMap};
-use crate::{HandshakeDeserialize, HandshakeSerialize};
+use crate::HandshakeSerialize;
 
 use failure::Error;
 
 /// ClientLoginReject is received after the client failed to login
 /// It contains an error message as String
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct ClientLoginReject {
-    error: String,
+    pub error: String,
 }
 
 impl HandshakeSerialize for ClientLoginReject {
@@ -26,21 +25,10 @@ impl HandshakeSerialize for ClientLoginReject {
     }
 }
 
-impl HandshakeDeserialize for ClientLoginReject {
-    fn parse(b: &[u8]) -> Result<(usize, Self), Error> {
-        let (len, values): (usize, VariantMap) = HandshakeDeserialize::parse(b)?;
-
-        let msgtype = match_variant!(&values["MsgType"], Variant::StringUTF8);
-
-        if msgtype == "ClientLogin" {
-            return Ok((
-                len,
-                Self {
-                    error: match_variant!(values["ErrorString"], Variant::String),
-                },
-            ));
-        } else {
-            bail!(ProtocolError::WrongMsgType);
+impl From<VariantMap> for ClientLoginReject {
+    fn from(input: VariantMap) -> Self {
+        ClientLoginReject {
+            error: match_variant!(input.get("ErrorString").unwrap(), Variant::String),
         }
     }
 }
-- 
cgit v1.2.3