chore: Update rust to 1.40-nightly. (#40)

nervosnetwork · Nov 8, 2019 · 4c6b6a1 · 4c6b6a1
1 parent abceb26
commit 4c6b6a1
Show file tree

Hide file tree

Showing 27 changed files with 154 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.com/nervosnetwork/muta.svg?branch=master)](https://travis-ci.com/nervosnetwork/muta)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-nightly-informational.svg)](https://github.com/cryptape/overlord/blob/master/rust-toolchain)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-nightly-informational.svg)](https://github.com/nervosnetwork/muta/blob/master/rust-toolchain)
 
 Muta is a high-performance blockchain framework.
 
@@ -39,7 +39,6 @@ Go to [http://127.0.0.1:8000/graphiql](http://127.0.0.1:8000/graphiql) to commun
 
 The develop chain is worked on **LOCAL** and **SINGLE NODE**.
 
-
 ## How to Contribute
 
 The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md), and security policy is described in [SECURITY.md](SECURITY.md).
diff --git a/common/merkle/src/lib.rs b/common/merkle/src/lib.rs
@@ -35,7 +35,7 @@ impl Merkle {
                     .into_iter()
                     .map(|node| ProofNode {
                         is_right: node.is_right,
-                        hash:     node.hash.clone(),
+                        hash:     node.hash,
                     })
                     .collect()
             })

diff --git a/core/api/Cargo.toml b/core/api/Cargo.toml
@@ -17,4 +17,4 @@ juniper_codegen = "0.13"
 async-trait = "0.1"
 hex = "0.3"
 bytes = "0.4"
-futures-preview = { version = "0.3.0-alpha.19" }
+futures = "0.3"
diff --git a/core/api/src/lib.rs b/core/api/src/lib.rs
@@ -267,8 +267,8 @@ fn gen_input_tx_encryption(
     let signature = privkey.sign_message(&hash_value);
 
     let input_encryption = InputTransactionEncryption {
-        tx_hash:   tx_hash.clone(),
-        pubkey:    Bytes::from(pubkey.to_bytes()),
+        tx_hash,
+        pubkey: Bytes::from(pubkey.to_bytes()),
         signature: Bytes::from(signature.to_bytes()),
     };
     Ok(input_encryption)

diff --git a/core/consensus/Cargo.toml b/core/consensus/Cargo.toml
@@ -12,7 +12,7 @@ bincode = "1.1"
 bytes = "0.4"
 creep = "0.1"
 derive_more = "0.15"
-futures-preview = "0.3.0-alpha.19"
+futures = "0.3"
 log = "0.4"
 overlord = "0.1"
 parking_lot = "0.9"

diff --git a/core/consensus/src/fixed_types.rs b/core/consensus/src/fixed_types.rs
@@ -168,7 +168,7 @@ mod test {
             logs_bloom: Default::default(),
             order_root: nonce.clone(),
             confirm_root: Vec::new(),
-            state_root: nonce.clone(),
+            state_root: nonce,
             receipt_root: Vec::new(),
             cycles_used: 999_999,
             proposer: UserAddress::from_hex(addr_str).unwrap(),
@@ -212,7 +212,7 @@ mod test {
             cycle:    random::<u64>(),
         };
         let action = TransactionAction::Transfer {
-            receiver:       address.clone(),
+            receiver:       address,
             carrying_asset: CarryingAsset {
                 asset_id: nonce.clone(),
                 amount:   FromPrimitive::from_i32(42).unwrap(),

diff --git a/core/executor/src/lib.rs b/core/executor/src/lib.rs
@@ -161,8 +161,8 @@ impl<DB: TrieDB> Executor for TransactionExecutor<DB> {
         Ok(ExecutorExecResp {
             receipts,
             all_cycles_used,
+            state_root,
             logs_bloom: Bloom::default(),
-            state_root: state_root.clone(),
         })
     }
 
@@ -223,7 +223,7 @@ impl<DB: TrieDB> TransactionExecutor<DB> {
 
         Ok(ReceiptResult::Transfer {
             receiver: UserAddress::from_bytes(to.as_bytes())?,
-            asset_id: carrying_asset.asset_id.clone(),
+            asset_id: carrying_asset.asset_id,
             before_amount,
             after_amount,
         })
@@ -298,7 +298,7 @@ impl<DB: 'static + TrieDB> ExecutorFactory<DB> for TransactionExecutorFactory {
             if state_root == Hash::from_empty() {
                 MPTTrie::new(Arc::clone(&db))
             } else {
-                MPTTrie::from(state_root.clone(), Arc::clone(&db))?
+                MPTTrie::from(state_root, Arc::clone(&db))?
             }
         };
 

diff --git a/core/executor/src/native_contract/bank.rs b/core/executor/src/native_contract/bank.rs
@@ -79,7 +79,7 @@ impl<StateAdapter: ContractStateAdapter> BankContract<StateAdapter>
 
         self.state_adapter
             .borrow_mut()
-            .insert_cache::<FixedAssetSchema>(asset_id.clone(), asset.clone())?;
+            .insert_cache::<FixedAssetSchema>(asset_id, asset.clone())?;
 
         let cycles_used = consume_cycles(
             CyclesAction::BankRegister,

diff --git a/core/executor/src/tests/account_contract.rs b/core/executor/src/tests/account_contract.rs
@@ -28,13 +28,7 @@ fn test_account_contract() {
         asset_id: asset.clone(),
         amount:   1000u64.into(),
     };
-    let ctx = mock_invoke_context(
-        user1.clone(),
-        Some(carrying_asset),
-        0,
-        1_000_000,
-        fee_asset.clone(),
-    );
+    let ctx = mock_invoke_context(user1.clone(), Some(carrying_asset), 0, 1_000_000, fee_asset);
     account.transfer(Rc::clone(&ctx), &user2).unwrap();
     let user1_balance = account.get_balance(&asset, &user1).unwrap();
     assert_eq!(user1_balance, Balance::from(9000u64));