Upgrade rlp library to 0.4.0

This version removed the dependency on elastic_array.

Author: Seulgi Kim

Cargo.lock

@@ -33,7 +33,7 @@ num-rational = "0.2.1"
 parking_lot = "0.6.0"
 primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" }
 rand = "0.6.1"
-rlp = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.3" }
+rlp = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.4" }
 rlp_compress = { path = "../util/rlp_compress" }
 rlp_derive = { path = "../util/rlp_derive" }
 snap = "0.2"

core/Cargo.toml

@@ -323,7 +323,7 @@ impl BodyProvider for BodyDB {
         let compressed_body =
             self.db.get(db::COL_BODIES, hash).expect("Low level database error. Some issue with disk?")?;
 
-        let raw_body = decompress(&compressed_body, blocks_swapper()).into_vec();
+        let raw_body = decompress(&compressed_body, blocks_swapper());
         let mut lock = self.body_cache.lock();
         lock.insert(*hash, raw_body.clone());
 

core/src/blockchain/body_db.rs

@@ -425,7 +425,7 @@ fn block_header_data(
     // Read from DB and populate cache
     let b = db.get(db::COL_HEADERS, hash).expect("Low level database error. Some issue with disk?")?;
 
-    let bytes = decompress(&b, blocks_swapper()).into_vec();
+    let bytes = decompress(&b, blocks_swapper());
 
     let mut lock = header_cache.lock();
     if let Some(v) = lock.get_mut(hash) {

core/src/blockchain/headerchain.rs

@@ -75,17 +75,17 @@ impl Seal {
         match self {
             Seal::None => None,
             Seal::Solo => Some(Vec::new()),
-            Seal::SimplePoA(signature) => Some(vec![::rlp::encode(signature).into_vec()]),
+            Seal::SimplePoA(signature) => Some(vec![::rlp::encode(signature)]),
             Seal::Tendermint {
                 prev_view,
                 cur_view,
                 precommits,
                 precommit_bitset,
             } => Some(vec![
-                ::rlp::encode(prev_view).into_vec(),
-                ::rlp::encode(cur_view).into_vec(),
-                ::rlp::encode_list(precommits).into_vec(),
-                ::rlp::encode(precommit_bitset).into_vec(),
+                ::rlp::encode(prev_view),
+                ::rlp::encode(cur_view),
+                ::rlp::encode_list(precommits),
+                ::rlp::encode(precommit_bitset),
             ]),
         }
     }

core/src/consensus/mod.rs

@@ -173,7 +173,7 @@ mod tests {
     fn fail_to_verify_signature_when_seal_is_invalid() {
         let engine = Scheme::new_test_simple_poa().engine;
         let mut header: Header = Header::default();
-        header.set_seal(vec![::rlp::encode(&Signature::default()).into_vec()]);
+        header.set_seal(vec![::rlp::encode(&Signature::default())]);
 
         let verify_result = engine.verify_block_external(&header);
         assert!(verify_result.is_err());

core/src/consensus/simple_poa/mod.rs

@@ -175,7 +175,7 @@ mod tests {
 
         assert!(engine.verify_header_basic(&header).is_ok());
 
-        header.set_seal(vec![::rlp::encode(&H520::default()).into_vec()]);
+        header.set_seal(vec![::rlp::encode(&H520::default())]);
 
         assert!(engine.verify_block_seal(&header).is_ok());
     }

core/src/consensus/solo/mod.rs

@@ -82,7 +82,7 @@ impl<'a> StakeAccount<'a> {
         let account_key = get_account_key(self.address);
         if self.balance != 0 {
             let rlp = rlp::encode(&self.balance);
-            state.update_action_data(&account_key, rlp.into_vec())?;
+            state.update_action_data(&account_key, rlp)?;
         } else {
             state.remove_action_data(&account_key);
         }
@@ -716,7 +716,7 @@ where
     for value in set.iter() {
         rlp.append(value);
     }
-    rlp.drain().into_vec()
+    rlp.drain()
 }
 
 fn decode_map<K, V>(data: Option<&ActionData>) -> BTreeMap<K, V>
@@ -750,7 +750,7 @@ where
     V: Encodable, {
     let mut rlp = RlpStream::new();
     encode_map_impl(&mut rlp, map);
-    rlp.drain().into_vec()
+    rlp.drain()
 }
 
 fn encode_map_impl<K, V>(rlp: &mut RlpStream, map: &BTreeMap<K, V>)
@@ -789,7 +789,7 @@ where
     encode_map_impl(&mut rlp, map0);
     encode_map_impl(&mut rlp, map1);
 
-    rlp.drain().into_vec()
+    rlp.drain()
 }
 
 fn encode_iter<'a, V, I>(iter: I) -> Vec<u8>
@@ -801,7 +801,7 @@ where
     for value in iter {
         rlp.append(value);
     }
-    rlp.drain().into_vec()
+    rlp.drain()
 }
 
 #[cfg(test)]

core/src/consensus/stake/action_data.rs

@@ -74,7 +74,7 @@ pub fn backup(db: &dyn KeyValueDB, backup_data: BackupView) {
         "version key should end with the backup key"
     );
     db_version::set_version(&mut batch, db_version::VERSION_KEY_TENDERMINT_BACKUP, BACKUP_VERSION);
-    batch.put(db::COL_EXTRA, BACKUP_KEY, &s.drain().into_vec());
+    batch.put(db::COL_EXTRA, BACKUP_KEY, &s.drain());
     db.write(batch).expect("Low level database error. Some issue with disk?");
 }
 
@@ -150,7 +150,6 @@ fn migrate_from_0_to_1(db: &dyn KeyValueDB) {
 fn load_v0(db: &dyn KeyValueDB) -> Option<BackupDataV0> {
     let value = db.get(db::COL_EXTRA, BACKUP_KEY).expect("Low level database error. Some issue with disk?");
     let (height, view, step, votes, last_confirmed_view) = value.map(|bytes| {
-        let bytes = bytes.into_vec();
         let rlp = rlp::Rlp::new(&bytes);
         (
             rlp.val_at(0).unwrap(),

core/src/consensus/tendermint/backup.rs

@@ -99,15 +99,15 @@ impl TendermintExtension {
 
     fn broadcast_message(&self, message: Bytes) {
         let tokens = self.select_random_peers();
-        let message = Arc::new(TendermintMessage::ConsensusMessage(vec![message]).rlp_bytes().into_vec());
+        let message = Arc::new(TendermintMessage::ConsensusMessage(vec![message]).rlp_bytes());
         for token in tokens {
             self.api.send(&token, Arc::clone(&message));
         }
     }
 
     fn send_votes(&self, token: &NodeId, messages: Vec<Bytes>) {
         ctrace!(ENGINE, "Send messages({}) to {}", messages.len(), token);
-        let message = Arc::new(TendermintMessage::ConsensusMessage(messages).rlp_bytes().into_vec());
+        let message = Arc::new(TendermintMessage::ConsensusMessage(messages).rlp_bytes());
         self.api.send(token, message);
     }
 
@@ -127,8 +127,7 @@ impl TendermintExtension {
                 lock_view,
                 known_votes: votes,
             }
-            .rlp_bytes()
-            .into_vec(),
+            .rlp_bytes(),
         );
 
         for token in tokens {
@@ -143,8 +142,7 @@ impl TendermintExtension {
                 message,
                 view,
             }
-            .rlp_bytes()
-            .into_vec(),
+            .rlp_bytes(),
         );
         for token in self.peers.keys() {
             self.api.send(token, Arc::clone(&message));
@@ -179,8 +177,7 @@ impl TendermintExtension {
                 height,
                 view,
             }
-            .rlp_bytes()
-            .into_vec(),
+            .rlp_bytes(),
         );
         self.api.send(&token, message);
     }
@@ -201,8 +198,7 @@ impl TendermintExtension {
                 vote_step,
                 requested_votes,
             }
-            .rlp_bytes()
-            .into_vec(),
+            .rlp_bytes(),
         );
         self.api.send(&token, message);
     }
@@ -360,7 +356,7 @@ impl NetworkExtension<Event> for TendermintExtension {
                     })
                     .unwrap();
 
-                let votes: Vec<_> = receiver.iter().map(|vote| vote.rlp_bytes().into_vec()).collect();
+                let votes: Vec<_> = receiver.iter().map(|vote| vote.rlp_bytes()).collect();
                 if !votes.is_empty() {
                     self.send_votes(token, votes);
                 }