From 20da110e38ea2390bc0f44136998464fef98aefd Mon Sep 17 00:00:00 2001
From: Max Audron <audron@cocaine.farm>
Date: Wed, 22 Jan 2020 16:11:38 +0100
Subject: update

---
 src/tests/handshake_types.rs | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'src/tests')

diff --git a/src/tests/handshake_types.rs b/src/tests/handshake_types.rs
index 227bdad..d9368b2 100644
--- a/src/tests/handshake_types.rs
+++ b/src/tests/handshake_types.rs
@@ -5,7 +5,7 @@ use crate::protocol::primitive::{Variant};
 pub fn serialize_variantmap() {
     let mut test_variantmap = VariantMap::new();
     test_variantmap.insert("Configured".to_string(), Variant::bool(true));
-    let bytes = [0, 0, 0, 39, 0, 0, 0, 10, 0, 0, 0, 10, 0,
+    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!(
@@ -20,9 +20,7 @@ pub fn read_variantmap() {
 
     let test_bytes: Vec<u8> = vec![
         // len
-        0, 0, 0, 74,
-        // var
-        0, 0, 0, 10, // 4
+        0, 0, 0, 4, // 4
         // var
         0, 0, 0, 10, 0, // 5
         // strlen, str
@@ -38,16 +36,14 @@ pub fn read_variantmap() {
         // extra
         0, 0, 0, 1];
 
-    let mut buf: Vec<u8> = [0; 78].to_vec();
+    let mut buf: Vec<u8> = [0; 74].to_vec();
     let len = VariantMap::read(&mut Cursor::new(&test_bytes), &mut buf).unwrap();
 
-    assert_eq!(len, 78);
+    assert_eq!(len, 74);
 
     let result_bytes: Vec<u8> = vec![
         // len
-        0, 0, 0, 74,
-        // var
-        0, 0, 0, 10,
+        0, 0, 0, 4,
         // var
         0, 0, 0, 10, 0,
         // strlen, str
@@ -65,31 +61,32 @@ pub fn read_variantmap() {
 
 #[test]
 pub fn deserialize_variantmap() {
-    let test_bytes: &[u8] = &[0, 0, 0, 39, 0, 0, 0, 10, 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));
 
     let (len, res) = VariantMap::parse(test_bytes).unwrap();
 
-    assert_eq!(len, 43);
+    assert_eq!(len, 39);
     assert_eq!(res, test_variantmap);
 }
 
 #[test]
 pub fn deserialize_variantmap_utf8() {
-    let test_bytes: &[u8] = &[0, 0, 0, 29, 0, 0, 0, 10, 0, 0, 0, 12, 0,
+    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, 10, 67, 111, 110, 102, 105, 103, 117, 114
-//                              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));
 
     let (len, res) = VariantMap::parse(test_bytes).unwrap();
 
-    assert_eq!(len, 33);
+    assert_eq!(len, 29);
     assert_eq!(res, test_variantmap);
 }
-- 
cgit v1.2.3