refactor everything

4 files changed, 29 insertions, 32 deletions

diff --git a/src/tests/base_types.rs b/src/tests/base_types.rs
index 4cc56ae..bbd2fc3 100644
--- a/src/tests/base_types.rs
+++ b/src/tests/base_types.rs
@@ -1,7 +1,7 @@
-use crate::protocol::primitive::deserialize::{Deserialize, DeserializeUTF8};
-use crate::protocol::primitive::serialize::{Serialize, SerializeUTF8};
+use crate::{Deserialize, DeserializeUTF8};
+use crate::{Serialize, SerializeUTF8};
 
-use crate::protocol::primitive::*;
+use crate::primitive::*;
 
 #[test]
 pub fn serialize_string() {
diff --git a/src/tests/frame.rs b/src/tests/frame.rs
index 0bc87ad..878379f 100644
--- a/src/tests/frame.rs
+++ b/src/tests/frame.rs
@@ -20,7 +20,7 @@ use flate2::Decompress;
 use flate2::FlushCompress;
 use flate2::FlushDecompress;
 
-use crate::protocol::frame::QuasselCodec;
+use crate::frame::QuasselCodec;
 
 macro_rules! mock {
     ($($x:expr,)*) => {{
@@ -131,24 +131,23 @@ pub fn read_single_frame_compressed() {
     assert_done!(io);
 }
 
-// TODO shit doens't work for whatever reason
-// #[test]
-// pub fn read_multi_frame_compressed() {
-//     let io = FramedRead::new(
-//         mock! {
-//             data(
-//                 b"\x78\x9c\x63\x60\x60\xe0\x4c\x4c\x4a\x4e\x49\x4d\x4b\xcf\xc8\x04\x00\x11\xec\x03\x97\x78\x9c\x63\x60\x60\x60\x36\x34\x32\x06\x00\x01\x3d\x00\x9a\x78\x9c\x63\x60\x60\xe0\xce\x48\xcd\xc9\xc9\x57\x28\xcf\x2f\xca\x49\x01\x00\x1a\x93\x04\x68",
-//             ),
-//         },
-//         QuasselCodec::builder().compression(true).new_codec(),
-//     );
-//     pin_mut!(io);
-//
-//     assert_next_eq!(io, b"abcdefghi");
-//     assert_next_eq!(io, b"123");
-//     assert_next_eq!(io, b"hello world");
-//     assert_done!(io);
-// }
+#[test]
+pub fn read_multi_frame_compressed() {
+    let io = FramedRead::new(
+        mock! {
+            data(
+                b"\x78\x9c\x63\x60\x60\xe0\x4c\x4c\x4a\x4e\x49\x4d\x4b\xcf\xc8\x04\x00\x11\xec\x03\x97\x78\x9c\x63\x60\x60\x60\x36\x34\x32\x06\x00\x01\x3d\x00\x9a\x78\x9c\x63\x60\x60\xe0\xce\x48\xcd\xc9\xc9\x57\x28\xcf\x2f\xca\x49\x01\x00\x1a\x93\x04\x68",
+            ),
+        },
+        QuasselCodec::builder().compression(true).new_codec(),
+    );
+    pin_mut!(io);
+
+    assert_next_eq!(io, b"abcdefghi");
+    assert_next_eq!(io, b"123");
+    assert_next_eq!(io, b"hello world");
+    assert_done!(io);
+}
 
 // ======================
 // ===== Test utils =====
diff --git a/src/tests/handshake_types.rs b/src/tests/handshake_types.rs
index d18ec8a..1e789c1 100644
--- a/src/tests/handshake_types.rs
+++ b/src/tests/handshake_types.rs
@@ -1,5 +1,5 @@
-use crate::protocol::message::handshake::{HandshakeDeserialize, HandshakeSerialize, VariantMap};
-use crate::protocol::primitive::Variant;
+use crate::primitive::{Variant, VariantMap};
+use crate::{HandshakeDeserialize, HandshakeSerialize};
 
 #[test]
 pub fn serialize_variantmap() {
diff --git a/src/tests/variant_types.rs b/src/tests/variant_types.rs
index 0381f07..7ba4166 100644
--- a/src/tests/variant_types.rs
+++ b/src/tests/variant_types.rs
@@ -1,9 +1,7 @@
-use crate::protocol::primitive::deserialize::Deserialize;
-use crate::protocol::primitive::serialize::Serialize;
+use crate::Deserialize;
+use crate::Serialize;
 
-use crate::protocol::primitive::{
-    BufferInfo, BufferType, Message, Variant, VariantList, VariantMap,
-};
+use crate::primitive::{BufferInfo, BufferType, Message, Variant, VariantList, VariantMap};
 
 #[test]
 pub fn serialize_variant_bool() {
@@ -56,13 +54,13 @@ pub fn serialize_variantmap() {
 #[test]
 pub fn deserialize_variantmap() {
     let test_bytes: &[u8] = &[
-        0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0,
-        117, 0, 114, 0, 101, 0, 100, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1,
+        0, 0, 0, 1, 0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0,
+        101, 0, 100, 0, 0, 0, 1, 0, 1,
     ];
     let (len, res) = VariantMap::parse(test_bytes).unwrap();
     let mut test_variantmap = VariantMap::new();
     test_variantmap.insert("Configured".to_string(), Variant::bool(true));
-    assert_eq!(len, 39);
+    assert_eq!(len, 34);
     assert_eq!(res, test_variantmap);
 }