1 files changed, 16 insertions, 64 deletions
diff --git a/src/tests/handshake_types.rs b/src/tests/handshake_types.rs
index d9368b2..d18ec8a 100644
--- a/src/tests/handshake_types.rs
+++ b/src/tests/handshake_types.rs
@@ -1,71 +1,24 @@
-use crate::protocol::message::handshake::{VariantMap, HandshakeSerialize, HandshakeDeserialize, HandshakeQRead};
-use crate::protocol::primitive::{Variant};
+use crate::protocol::message::handshake::{HandshakeDeserialize, HandshakeSerialize, VariantMap};
+use crate::protocol::primitive::Variant;
 
 #[test]
 pub fn serialize_variantmap() {
     let mut test_variantmap = VariantMap::new();
     test_variantmap.insert("Configured".to_string(), Variant::bool(true));
-    let bytes = [0, 0, 0, 2, 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].to_vec();
-    assert_eq!(
-        test_variantmap.serialize().unwrap(),
-        bytes
-    );
-}
-
-#[test]
-pub fn read_variantmap() {
-    use std::io::Cursor;
-
-    let test_bytes: Vec<u8> = vec![
-        // len
-        0, 0, 0, 4, // 4
-        // var
-        0, 0, 0, 10, 0, // 5
-        // strlen, str
-        0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100, // 24
-        // bool
-        0, 0, 0, 1, 0, 1, // 6
-        // var
-        0, 0, 0, 10, 0, // 5
-        // strlen, str
-        0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100, // 24
-        // bool
-        0, 0, 0, 1, 0, 1, //6
-        // extra
-        0, 0, 0, 1];
-
-    let mut buf: Vec<u8> = [0; 74].to_vec();
-    let len = VariantMap::read(&mut Cursor::new(&test_bytes), &mut buf).unwrap();
-
-    assert_eq!(len, 74);
-
-    let result_bytes: Vec<u8> = vec![
-        // len
-        0, 0, 0, 4,
-        // var
-        0, 0, 0, 10, 0,
-        // strlen, str
-        0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100,
-        // bool
-        0, 0, 0, 1, 0, 1,
-        // var
-        0, 0, 0, 10, 0,
-        // strlen, str
-        0, 0, 0, 20, 0, 67, 0, 111, 0, 110, 0, 102, 0, 105, 0, 103, 0, 117, 0, 114, 0, 101, 0, 100,
-        // bool
-        0, 0, 0, 1, 0, 1];
-    assert_eq!(buf, result_bytes);
+    let bytes = [
+        0, 0, 0, 2, 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,
+    ]
+    .to_vec();
+    assert_eq!(test_variantmap.serialize().unwrap(), bytes);
 }
 
 #[test]
 pub fn deserialize_variantmap() {
-    let test_bytes: &[u8] = &[0, 0, 0, 2,
-                              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];
+    let test_bytes: &[u8] = &[
+        0, 0, 0, 2, 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,
+    ];
     let mut test_variantmap = VariantMap::new();
     test_variantmap.insert("Configured".to_string(), Variant::bool(true));
 
@@ -77,11 +30,10 @@ pub fn deserialize_variantmap() {
 
 #[test]
 pub fn deserialize_variantmap_utf8() {
-    let test_bytes: &[u8] = &[0, 0, 0, 2,
-                              0, 0, 0, 12, 0,
-                              0, 0, 0, 10, 67, 111, 110, 102, 105, 103, 117, 114, 101, 100,
-                              0, 0, 0, 1, 0, 1,
-                              0, 0, 0, 1];
+    let test_bytes: &[u8] = &[
+        0, 0, 0, 2, 0, 0, 0, 12, 0, 0, 0, 0, 10, 67, 111, 110, 102, 105, 103, 117, 114, 101, 100,
+        0, 0, 0, 1, 0, 1, 0, 0, 0, 1,
+    ];
     let mut test_variantmap = VariantMap::new();
     test_variantmap.insert("Configured".to_string(), Variant::bool(true));