refactor deserialize and serializevariant trait

move stuff around a bit to sepperate it out for deserializevariant

10 files changed, 10 insertions, 10 deletions

diff --git a/src/message/handshake/connack.rs b/src/message/handshake/connack.rs
index bed0cb5..d325cb9 100644
--- a/src/message/handshake/connack.rs
+++ b/src/message/handshake/connack.rs
@@ -41,7 +41,7 @@ impl crate::serialize::Serialize for ConnAck {
     }
 }
 
-impl crate::deserialize::Deserialize for ConnAck {
+impl crate::serialize::Deserialize for ConnAck {
     fn parse(b: &[u8]) -> Result<(usize, Self), ProtocolError> {
         let (flen, flags) = u8::parse(b)?;
         let (elen, extra) = i16::parse(&b[flen..])?;
diff --git a/src/message/handshake/init.rs b/src/message/handshake/init.rs
index 51514ff..9f011ed 100644
--- a/src/message/handshake/init.rs
+++ b/src/message/handshake/init.rs
@@ -1,4 +1,4 @@
-use crate::{deserialize::Deserialize, serialize::Serialize};
+use crate::serialize::{Deserialize, Serialize};
 
 /// The first few bytes sent to the core to initialize the connection and setup if we want to use tls and compression
 #[derive(Clone, Debug)]
diff --git a/src/message/handshake/protocol.rs b/src/message/handshake/protocol.rs
index c12da05..73a82b9 100644
--- a/src/message/handshake/protocol.rs
+++ b/src/message/handshake/protocol.rs
@@ -1,4 +1,4 @@
-use crate::{deserialize::Deserialize, serialize::Serialize};
+use crate::serialize::{Deserialize, Serialize};
 
 pub enum Protocol {
     Legacy = 0x00000001,
diff --git a/src/message/handshake/types.rs b/src/message/handshake/types.rs
index fd8c8fa..bebeb4c 100644
--- a/src/message/handshake/types.rs
+++ b/src/message/handshake/types.rs
@@ -3,8 +3,8 @@ use std::vec::Vec;
 
 use crate::error::ProtocolError;
 use crate::primitive::Variant;
+use crate::serialize::{Deserialize, Serialize};
 use crate::util;
-use crate::{deserialize::Deserialize, serialize::Serialize};
 
 use crate::message::handshake::{HandshakeDeserialize, HandshakeSerialize};
 use crate::primitive::VariantMap;
diff --git a/src/message/signalproxy/heartbeat.rs b/src/message/signalproxy/heartbeat.rs
index 32df3d4..9c952e5 100644
--- a/src/message/signalproxy/heartbeat.rs
+++ b/src/message/signalproxy/heartbeat.rs
@@ -1,7 +1,7 @@
 use crate::error::ProtocolError;
 use crate::message::MessageType;
 use crate::primitive::{DateTime, Variant, VariantList};
-use crate::{deserialize::Deserialize, serialize::Serialize};
+use crate::serialize::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, std::cmp::PartialEq)]
 pub struct HeartBeat {
diff --git a/src/message/signalproxy/initdata.rs b/src/message/signalproxy/initdata.rs
index 2b9fa18..efdd8d7 100644
--- a/src/message/signalproxy/initdata.rs
+++ b/src/message/signalproxy/initdata.rs
@@ -1,7 +1,7 @@
 use crate::error::ProtocolError;
 use crate::message::MessageType;
 use crate::primitive::{Variant, VariantList};
-use crate::{deserialize::Deserialize, serialize::Serialize};
+use crate::serialize::{Deserialize, Serialize};
 
 use super::objects::Types;
 
diff --git a/src/message/signalproxy/initrequest.rs b/src/message/signalproxy/initrequest.rs
index 79b6cbc..1990dba 100644
--- a/src/message/signalproxy/initrequest.rs
+++ b/src/message/signalproxy/initrequest.rs
@@ -1,7 +1,7 @@
 use crate::error::ProtocolError;
 use crate::message::MessageType;
 use crate::primitive::{Variant, VariantList};
-use crate::{deserialize::Deserialize, serialize::Serialize};
+use crate::serialize::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, std::cmp::PartialEq)]
 pub struct InitRequest {
diff --git a/src/message/signalproxy/mod.rs b/src/message/signalproxy/mod.rs
index 5801846..6cd887b 100644
--- a/src/message/signalproxy/mod.rs
+++ b/src/message/signalproxy/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
-    deserialize::Deserialize,
     error::ProtocolError,
     primitive::{Variant, VariantList},
+    serialize::Deserialize,
     serialize::Serialize,
 };
 
diff --git a/src/message/signalproxy/rpccall.rs b/src/message/signalproxy/rpccall.rs
index 04c75cb..833fad9 100644
--- a/src/message/signalproxy/rpccall.rs
+++ b/src/message/signalproxy/rpccall.rs
@@ -2,7 +2,7 @@ use crate::error::ProtocolError;
 use crate::message::MessageType;
 use crate::primitive::Message;
 use crate::primitive::{Variant, VariantList};
-use crate::{deserialize::Deserialize, serialize::Serialize};
+use crate::serialize::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, std::cmp::PartialEq)]
 pub enum RpcCall {
diff --git a/src/message/signalproxy/syncmessage.rs b/src/message/signalproxy/syncmessage.rs
index b1123ac..94930af 100644
--- a/src/message/signalproxy/syncmessage.rs
+++ b/src/message/signalproxy/syncmessage.rs
@@ -1,7 +1,7 @@
 use crate::error::ProtocolError;
 use crate::message::MessageType;
 use crate::primitive::{Variant, VariantList};
-use crate::{deserialize::Deserialize, serialize::Serialize};
+use crate::serialize::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Class {