chore: upgrade molecule

nervosnetwork · Jan 27, 2021 · 67ad2c0 · 67ad2c0
1 parent 2a62fb4
commit 67ad2c0
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 69 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 MOLC    := moleculec
-MOLC_VERSION := 0.6.0
+MOLC_VERSION := 0.7.0
 
 MOL_FILES := \
-  src/protocol_select/protocol_select.mol \
+  tentacle/src/protocol_select/protocol_select.mol \
   secio/src/handshake/handshake.mol \
 
 MOL_RUST_FILES := $(patsubst %.mol,%_mol.rs,${MOL_FILES})

diff --git a/secio/Cargo.toml b/secio/Cargo.toml
@@ -22,7 +22,7 @@ tokio = { version = "1.0", features = ["io-util"] }
 tokio-util = { version = "0.6.0", features = ["codec"] }
 log = "0.4.1"
 
-molecule = "0.6.0"
+molecule = "0.7.0"
 
 unsigned-varint = "0.3"
 bs58 = "0.3.0"

diff --git a/secio/src/handshake/handshake_mol.rs b/secio/src/handshake/handshake_mol.rs
@@ -1,4 +1,4 @@
-// Generated by Molecule 0.6.0
+// Generated by Molecule 0.7.0
 
 use molecule::prelude::*;
 #[derive(Clone)]
@@ -1214,22 +1214,20 @@ impl<'r> molecule::prelude::Reader<'r> for ProposeReader<'r> {
             return ve!(Self, HeaderIsBroken, molecule::NUMBER_SIZE * 2, slice_len);
         }
         let offset_first = molecule::unpack_number(&slice[molecule::NUMBER_SIZE..]) as usize;
-        if offset_first % 4 != 0 || offset_first < molecule::NUMBER_SIZE * 2 {
+        if offset_first % molecule::NUMBER_SIZE != 0 || offset_first < molecule::NUMBER_SIZE * 2 {
             return ve!(Self, OffsetsNotMatch);
         }
-        let field_count = offset_first / 4 - 1;
+        if slice_len < offset_first {
+            return ve!(Self, HeaderIsBroken, offset_first, slice_len);
+        }
+        let field_count = offset_first / molecule::NUMBER_SIZE - 1;
         if field_count < Self::FIELD_COUNT {
             return ve!(Self, FieldCountNotMatch, Self::FIELD_COUNT, field_count);
         } else if !compatible && field_count > Self::FIELD_COUNT {
             return ve!(Self, FieldCountNotMatch, Self::FIELD_COUNT, field_count);
         };
-        let header_size = molecule::NUMBER_SIZE * (field_count + 1);
-        if slice_len < header_size {
-            return ve!(Self, HeaderIsBroken, header_size, slice_len);
-        }
-        let mut offsets: Vec<usize> = slice[molecule::NUMBER_SIZE..]
-            .chunks(molecule::NUMBER_SIZE)
-            .take(field_count)
+        let mut offsets: Vec<usize> = slice[molecule::NUMBER_SIZE..offset_first]
+            .chunks_exact(molecule::NUMBER_SIZE)
             .map(|x| molecule::unpack_number(x) as usize)
             .collect();
         offsets.push(total_size);
@@ -1510,22 +1508,20 @@ impl<'r> molecule::prelude::Reader<'r> for ExchangeReader<'r> {
             return ve!(Self, HeaderIsBroken, molecule::NUMBER_SIZE * 2, slice_len);
         }
         let offset_first = molecule::unpack_number(&slice[molecule::NUMBER_SIZE..]) as usize;
-        if offset_first % 4 != 0 || offset_first < molecule::NUMBER_SIZE * 2 {
+        if offset_first % molecule::NUMBER_SIZE != 0 || offset_first < molecule::NUMBER_SIZE * 2 {
             return ve!(Self, OffsetsNotMatch);
         }
-        let field_count = offset_first / 4 - 1;
+        if slice_len < offset_first {
+            return ve!(Self, HeaderIsBroken, offset_first, slice_len);
+        }
+        let field_count = offset_first / molecule::NUMBER_SIZE - 1;
         if field_count < Self::FIELD_COUNT {
             return ve!(Self, FieldCountNotMatch, Self::FIELD_COUNT, field_count);
         } else if !compatible && field_count > Self::FIELD_COUNT {
             return ve!(Self, FieldCountNotMatch, Self::FIELD_COUNT, field_count);
         };
-        let header_size = molecule::NUMBER_SIZE * (field_count + 1);
-        if slice_len < header_size {
-            return ve!(Self, HeaderIsBroken, header_size, slice_len);
-        }
-        let mut offsets: Vec<usize> = slice[molecule::NUMBER_SIZE..]
-            .chunks(molecule::NUMBER_SIZE)
-            .take(field_count)
+        let mut offsets: Vec<usize> = slice[molecule::NUMBER_SIZE..offset_first]
+            .chunks_exact(molecule::NUMBER_SIZE)
             .map(|x| molecule::unpack_number(x) as usize)
             .collect();
         offsets.push(total_size);

diff --git a/secio/src/handshake/handshake_struct.rs b/secio/src/handshake/handshake_struct.rs
@@ -57,17 +57,14 @@ impl Propose {
             )
             .build();
 
-        Bytes::from(
-            handshake_mol::Propose::new_builder()
-                .rand(rand)
-                .pubkey(pubkey)
-                .exchanges(exchange)
-                .ciphers(ciphers)
-                .hashes(hashes)
-                .build()
-                .as_slice()
-                .to_owned(),
-        )
+        handshake_mol::Propose::new_builder()
+            .rand(rand)
+            .pubkey(pubkey)
+            .exchanges(exchange)
+            .ciphers(ciphers)
+            .hashes(hashes)
+            .build()
+            .as_bytes()
     }
 
     /// Decode with molecule
@@ -103,14 +100,11 @@ impl Exchange {
             .set(self.signature.into_iter().map(Into::into).collect())
             .build();
 
-        Bytes::from(
-            handshake_mol::Exchange::new_builder()
-                .epubkey(epubkey)
-                .signature(signature)
-                .build()
-                .as_slice()
-                .to_owned(),
-        )
+        handshake_mol::Exchange::new_builder()
+            .epubkey(epubkey)
+            .signature(signature)
+            .build()
+            .as_bytes()
     }
 
     /// Decode with molecule
@@ -163,7 +157,7 @@ impl PublicKey {
         let pubkey = handshake_mol::PublicKey::new_builder()
             .set(secp256k1)
             .build();
-        Bytes::from(pubkey.as_slice().to_owned())
+        pubkey.as_bytes()
     }
 
     /// Decode with molecule

diff --git a/tentacle/Cargo.toml b/tentacle/Cargo.toml
@@ -31,7 +31,7 @@ async-std = { version = "1", features = ["unstable"], optional = true }
 async-io = { version = "1", optional = true }
 
 multiaddr = { path = "../multiaddr", package = "tentacle-multiaddr", version = "0.2.0" }
-molecule = "0.6.0"
+molecule = "0.7.0"
 
 # upnp
 igd = { version = "0.11", optional = true }

diff --git a/tentacle/src/protocol_select/mod.rs b/tentacle/src/protocol_select/mod.rs
@@ -52,14 +52,11 @@ impl ProtocolInfo {
             .set(versions)
             .build();
 
-        Bytes::from(
-            protocol_select_mol::ProtocolInfo::new_builder()
-                .name(name)
-                .support_versions(versions)
-                .build()
-                .as_slice()
-                .to_owned(),
-        )
+        protocol_select_mol::ProtocolInfo::new_builder()
+            .name(name)
+            .support_versions(versions)
+            .build()
+            .as_bytes()
     }
 
     /// Decode with molecule

diff --git a/tentacle/src/protocol_select/protocol_select_mol.rs b/tentacle/src/protocol_select/protocol_select_mol.rs
@@ -1,4 +1,4 @@
-// Generated by Molecule 0.6.0
+// Generated by Molecule 0.7.0
 
 use molecule::prelude::*;
 #[derive(Clone)]
@@ -438,17 +438,14 @@ impl<'r> molecule::prelude::Reader<'r> for StringVecReader<'r> {
             );
         }
         let offset_first = molecule::unpack_number(&slice[molecule::NUMBER_SIZE..]) as usize;
-        if offset_first % 4 != 0 || offset_first < molecule::NUMBER_SIZE * 2 {
+        if offset_first % molecule::NUMBER_SIZE != 0 || offset_first < molecule::NUMBER_SIZE * 2 {
             return ve!(Self, OffsetsNotMatch);
         }
-        let item_count = offset_first / 4 - 1;
-        let header_size = molecule::NUMBER_SIZE * (item_count + 1);
-        if slice_len < header_size {
-            return ve!(Self, HeaderIsBroken, header_size, slice_len);
+        if slice_len < offset_first {
+            return ve!(Self, HeaderIsBroken, offset_first, slice_len);
         }
-        let mut offsets: Vec<usize> = slice[molecule::NUMBER_SIZE..]
-            .chunks(molecule::NUMBER_SIZE)
-            .take(item_count)
+        let mut offsets: Vec<usize> = slice[molecule::NUMBER_SIZE..offset_first]
+            .chunks_exact(molecule::NUMBER_SIZE)
             .map(|x| molecule::unpack_number(x) as usize)
             .collect();
         offsets.push(total_size);
@@ -768,22 +765,20 @@ impl<'r> molecule::prelude::Reader<'r> for ProtocolInfoReader<'r> {
             return ve!(Self, HeaderIsBroken, molecule::NUMBER_SIZE * 2, slice_len);
         }
         let offset_first = molecule::unpack_number(&slice[molecule::NUMBER_SIZE..]) as usize;
-        if offset_first % 4 != 0 || offset_first < molecule::NUMBER_SIZE * 2 {
+        if offset_first % molecule::NUMBER_SIZE != 0 || offset_first < molecule::NUMBER_SIZE * 2 {
             return ve!(Self, OffsetsNotMatch);
         }
-        let field_count = offset_first / 4 - 1;
+        if slice_len < offset_first {
+            return ve!(Self, HeaderIsBroken, offset_first, slice_len);
+        }
+        let field_count = offset_first / molecule::NUMBER_SIZE - 1;
         if field_count < Self::FIELD_COUNT {
             return ve!(Self, FieldCountNotMatch, Self::FIELD_COUNT, field_count);
         } else if !compatible && field_count > Self::FIELD_COUNT {
             return ve!(Self, FieldCountNotMatch, Self::FIELD_COUNT, field_count);
         };
-        let header_size = molecule::NUMBER_SIZE * (field_count + 1);
-        if slice_len < header_size {
-            return ve!(Self, HeaderIsBroken, header_size, slice_len);
-        }
-        let mut offsets: Vec<usize> = slice[molecule::NUMBER_SIZE..]
-            .chunks(molecule::NUMBER_SIZE)
-            .take(field_count)
+        let mut offsets: Vec<usize> = slice[molecule::NUMBER_SIZE..offset_first]
+            .chunks_exact(molecule::NUMBER_SIZE)
             .map(|x| molecule::unpack_number(x) as usize)
             .collect();
         offsets.push(total_size);