upgrade rust

rink1969 · rink1969 · commit 25e833cb6229 · 2020-06-10T01:06:29.000+08:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -107,7 +107,7 @@ alias:
 
   - &job-default
     docker:
-      - image: cita/cita-build:ubuntu-18.04-20191128
+      - image: cita/cita-build:ubuntu-18.04-20200606
     working_directory: ~/cita-build
 
   - &job-unit-test
@@ -522,4 +522,4 @@ workflows:
             # - "Crosschain Test"
             # - "Test Snapshot Taking And Restoring"
             # - "JSON-RPC Mock Test in Charge Mode"
-            
+
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ stages:
   - Release
   - IntegrateTest
 before_install:
-  - docker pull cita/cita-build:ubuntu-18.04-20191128
+  - docker pull cita/cita-build:ubuntu-18.04-20200606
 jobs:
   include:
 
diff --git a/cita-auth/src/dispatcher.rs b/cita-auth/src/dispatcher.rs
@@ -25,7 +25,6 @@ use std::cell::RefCell;
 use std::collections::HashSet;
 use std::convert::Into;
 use std::thread;
-use tx_pool;
 
 pub struct Dispatcher {
     txs_pool: RefCell<tx_pool::Pool>,
diff --git a/cita-auth/src/handler.rs b/cita-auth/src/handler.rs
@@ -35,7 +35,6 @@ use lru::LruCache;
 use pubsub::channel::{Receiver, Sender};
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use rayon::ThreadPoolBuilder;
-use serde_json;
 use std::collections::{HashMap, HashSet};
 use std::convert::Into;
 use std::str::FromStr;
@@ -552,7 +551,7 @@ impl MsgHandler {
             let check_quota = block_tx_hashes.get_check_quota();
             self.config_info.check_quota = check_quota;
             self.config_info.block_quota_limit = block_quota_limit;
-            self.config_info.account_quota_limit = account_quota_limit.clone();
+            self.config_info.account_quota_limit = account_quota_limit;
             self.config_info.admin_address = if block_tx_hashes.get_admin_address().is_empty() {
                 None
             } else {
diff --git a/cita-chain/core/src/libchain/chain.rs b/cita-chain/core/src/libchain/chain.rs
@@ -20,7 +20,6 @@ use crate::header::{BlockNumber, Header};
 use crate::libchain::status::Status;
 use crate::log_blooms::LogBloomGroup;
 use crate::receipt::{Receipt, RichReceipt};
-use cita_merklehash;
 use hashable::Hashable;
 
 use libproto::blockchain::{
@@ -390,7 +389,7 @@ impl Chain {
 
         let chain = Chain {
             blooms_config,
-            current_header: RwLock::new(header.clone()),
+            current_header: RwLock::new(header),
             current_height,
             max_store_height,
             block_map: RwLock::new(BTreeMap::new()),
diff --git a/cita-chain/src/forward.rs b/cita-chain/src/forward.rs
@@ -33,7 +33,6 @@ use libproto::{
 };
 use proof::BftProof;
 use pubsub::channel::Sender;
-use serde_json;
 
 use crate::types::block::OpenBlock;
 use crate::types::block_number::BlockTag;
diff --git a/cita-chain/types/src/receipt.rs b/cita-chain/types/src/receipt.rs
@@ -122,9 +122,7 @@ impl From<ProtoReceipt> for Receipt {
             .collect();
 
         if receipt.error.is_some() {
-            error = Some(ReceiptError::from_proto(
-                receipt.clone().take_error().get_error(),
-            ));
+            error = Some(ReceiptError::from_proto(receipt.get_error().get_error()));
         }
 
         Receipt::new(
diff --git a/cita-executor/core/src/cita_executive.rs b/cita-executor/core/src/cita_executive.rs
@@ -503,7 +503,7 @@ impl<'a, B: DB + 'static> CitaExecutive<'a, B> {
         let amend_type = value.low_u32();
         match amend_type {
             AMEND_ABI => {
-                if self.transact_set_abi(&(data.to_owned().unwrap())) {
+                if self.transact_set_abi(&(data.unwrap())) {
                     Ok(None)
                 } else {
                     Err(VMError::Evm(EVMError::Internal(
@@ -512,7 +512,7 @@ impl<'a, B: DB + 'static> CitaExecutive<'a, B> {
                 }
             }
             AMEND_CODE => {
-                if self.transact_set_code(&(data.to_owned().unwrap())) {
+                if self.transact_set_code(&(data.unwrap())) {
                     Ok(None)
                 } else {
                     Err(VMError::Evm(EVMError::Internal(
@@ -521,7 +521,7 @@ impl<'a, B: DB + 'static> CitaExecutive<'a, B> {
                 }
             }
             AMEND_KV_H256 => {
-                if self.transact_set_kv_h256(&(data.to_owned().unwrap())) {
+                if self.transact_set_kv_h256(&(data.unwrap())) {
                     Ok(None)
                 } else {
                     Err(VMError::Evm(EVMError::Internal(
@@ -530,7 +530,7 @@ impl<'a, B: DB + 'static> CitaExecutive<'a, B> {
                 }
             }
             AMEND_GET_KV_H256 => {
-                if let Some(v) = self.transact_get_kv_h256(&(data.to_owned().unwrap())) {
+                if let Some(v) = self.transact_get_kv_h256(&(data.unwrap())) {
                     Ok(Some(v))
                 } else {
                     Err(VMError::Evm(EVMError::Internal(
@@ -539,7 +539,7 @@ impl<'a, B: DB + 'static> CitaExecutive<'a, B> {
                 }
             }
             AMEND_ACCOUNT_BALANCE => {
-                if self.transact_set_balance(&(data.to_owned().unwrap())) {
+                if self.transact_set_balance(&(data.unwrap())) {
                     Ok(None)
                 } else {
                     Err(VMError::Evm(EVMError::Internal(
@@ -607,7 +607,7 @@ pub fn create<B: DB + 'static>(
     let r = call(
         block_provider.clone(),
         state_provider.clone(),
-        store.clone(),
+        store,
         &reqchan,
     );
     match r {
diff --git a/cita-executor/core/src/cita_vm_helper.rs b/cita-executor/core/src/cita_vm_helper.rs
@@ -33,11 +33,8 @@ pub fn call_pure<B: DB + 'static>(
     let evm_context = store.borrow().evm_context.clone();
     let evm_cfg = store.borrow().evm_cfg.clone();
     let evm_params = request.clone();
-    let evm_data_provider = DataProvider::new(
-        block_provider.clone(),
-        state_provider.clone(),
-        store.clone(),
-    );
+    let evm_data_provider =
+        DataProvider::new(block_provider.clone(), state_provider.clone(), store);
     // Transfer value
     if !request.disable_transfer_value {
         state_provider.borrow_mut().transfer_balance(
diff --git a/cita-executor/core/src/contracts/native/crosschain_verify.rs b/cita-executor/core/src/contracts/native/crosschain_verify.rs
@@ -20,7 +20,6 @@ use crate::contracts::{
 use cita_types::{Address, H256, U256};
 use core::header::Header;
 use core::libchain::chain::TxProof;
-use ethabi;
 
 use crate::storage::Map;
 use crate::types::context::Context;
@@ -180,7 +179,7 @@ impl CrossChainVerify {
 
         let tokens = vec![
             ethabi::Token::Address(sender.into()),
-            ethabi::Token::Bytes(tx_data.clone()),
+            ethabi::Token::Bytes(tx_data),
         ];
         let result = ethabi::encode(&tokens);
         trace!("encoded {:?}", result);
diff --git a/cita-executor/core/src/data_provider.rs b/cita-executor/core/src/data_provider.rs
@@ -214,7 +214,7 @@ impl<B: DB + 'static> evm::DataProvider for DataProvider<B> {
             return false;
         }
         //self.store.borrow_mut().used(refund_to.clone());
-        self.store.borrow_mut().selfdestruct.insert(address.clone());
+        self.store.borrow_mut().selfdestruct.insert(*address);
         let b = self.get_balance(address);
 
         if address != refund_to {
@@ -270,7 +270,7 @@ impl<B: DB + 'static> evm::DataProvider for DataProvider<B> {
                 r.or(Err(evm::Error::CallError))
             }
             evm::OpCode::CREATE | evm::OpCode::CREATE2 => {
-                let mut request = params.clone();
+                let mut request = params;
                 request.nonce = self
                     .state_provider
                     .borrow_mut()
diff --git a/cita-executor/core/src/libexecutor/auto_exec.rs b/cita-executor/core/src/libexecutor/auto_exec.rs
@@ -56,14 +56,14 @@ pub fn auto_exec(
     let vm_exec_params = build_vm_exec_params(&params, state.clone());
     let mut sub_state = VMSubState::default();
 
-    sub_state.evm_context = build_evm_context(&context.clone());
+    sub_state.evm_context = build_evm_context(&context);
     sub_state.evm_cfg = get_interpreter_conf();
     let sub_state = Arc::new(RefCell::new(sub_state));
 
     match vm_call(
         Arc::new(block_provider),
-        state.clone(),
-        sub_state.clone(),
+        state,
+        sub_state,
         &vm_exec_params.into(),
     ) {
         Ok(res) => match res {
diff --git a/cita-executor/core/src/libexecutor/block.rs b/cita-executor/core/src/libexecutor/block.rs
@@ -34,7 +34,6 @@ use crate::types::errors::Error;
 use crate::types::errors::ReceiptError;
 use crate::types::errors::{AuthenticationError, ExecutionError};
 use crate::types::transaction::SignedTransaction;
-use cita_merklehash;
 use cita_types::{Address, Bloom as LogBloom, H256, U256};
 use cita_vm::{
     evm::Error as EVMError, state::State as CitaState, state::StateObjectInfo, Error as VMError,
diff --git a/cita-executor/core/src/libexecutor/command.rs b/cita-executor/core/src/libexecutor/command.rs
@@ -40,7 +40,6 @@ use jsonrpc_types::rpc_types::{
     MetaData,
 };
 use libproto::ExecutedResult;
-use serde_json;
 use std::cell::RefCell;
 use std::convert::{From, Into};
 use std::fmt;
@@ -321,8 +320,7 @@ impl Commander for Executor {
             return Err(format!(
                 "Requires quota higher than upper limit({}) or some internal errors",
                 max_quota
-            )
-            .to_owned());
+            ));
         } else {
             quota_used
         };
diff --git a/cita-executor/core/src/libexecutor/genesis.rs b/cita-executor/core/src/libexecutor/genesis.rs
@@ -24,7 +24,6 @@ use crypto::digest::Digest;
 use crypto::md5::Md5;
 use rlp::encode;
 use rustc_hex::FromHex;
-use serde_json;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::BufReader;
diff --git a/cita-executor/core/src/tests/exemock.rs b/cita-executor/core/src/tests/exemock.rs
@@ -128,11 +128,7 @@ impl DataProvider for DataProviderMock {
         self.db.get(address).is_some()
     }
 
-    fn call(
-        &self,
-        opcode: OpCode,
-        params: InterpreterParams,
-    ) -> (Result<InterpreterResult, Error>) {
+    fn call(&self, opcode: OpCode, params: InterpreterParams) -> Result<InterpreterResult, Error> {
         match opcode {
             OpCode::CALL => {
                 let mut it = Interpreter::new(
diff --git a/cita-executor/src/postman.rs b/cita-executor/src/postman.rs
@@ -29,7 +29,6 @@ use libproto::request::Request_oneof_req as Request;
 use libproto::router::{MsgType, RoutingKey, SubModules};
 use libproto::{request, response, Message};
 use libproto::{TryFrom, TryInto};
-use serde_json;
 use std::convert::Into;
 use std::u8;
 
@@ -212,16 +211,21 @@ impl Postman {
     // cita-chain broadcast StateSignal to indicate its state. So we could figure out
     // which blocks cita-chain lack of, then re-send the lacking blocks to cita-chain.
     fn reply_chain_state_signal(&self, state_signal: &StateSignal) -> Result<(), BlockTag> {
-        let specified_height = state_signal.get_height();
-        if specified_height < self.get_current_height() {
-            self.send_executed_info_to_chain(specified_height + 1)?;
-            for height in self.backlogs.completed_keys() {
-                if *height > specified_height + 1 {
-                    self.send_executed_info_to_chain(*height)?;
+        match state_signal.get_height() {
+            specified_height if specified_height < self.get_current_height() => {
+                self.send_executed_info_to_chain(specified_height + 1)?;
+                for height in self.backlogs.completed_keys() {
+                    if *height > specified_height + 1 {
+                        self.send_executed_info_to_chain(*height)?;
+                    }
                 }
             }
-        } else if specified_height > self.get_current_height() {
-            self.signal_to_chain();
+            specified_height if specified_height > self.get_current_height() => {
+                self.signal_to_chain();
+            }
+            _ => {
+                // specified_height == self.get_current_height()
+            }
         }
         Ok(())
     }
diff --git a/cita-forever b/cita-forever
@@ -1 +1 @@
-Subproject commit 2ba42d64ed38dec5ba9ef29b15cc52ee6215a2e9
+Subproject commit 8e7410093c4d55bf1afcca27f4df36567338aa2c
diff --git a/cita-jsonrpc/src/helper.rs b/cita-jsonrpc/src/helper.rs
@@ -21,7 +21,6 @@ use pubsub::channel::Sender;
 use std::collections::HashMap;
 use std::sync::Arc;
 use util::Mutex;
-use ws;
 
 pub enum TransferType {
     /// http output sender
diff --git a/cita-jsonrpc/src/http_server.rs b/cita-jsonrpc/src/http_server.rs
@@ -185,7 +185,7 @@ impl Service for Jsonrpc {
                     })
                     .then(move |resp| match resp {
                         Ok(resp) => Ok(resp),
-                        Err(err) => Ok(err.into_response(http_headers.clone())),
+                        Err(err) => Ok(err.into_response(http_headers)),
                     });
 
                 Box::new(fut_resp)
diff --git a/cita-jsonrpc/src/main.rs b/cita-jsonrpc/src/main.rs
@@ -209,8 +209,7 @@ fn main() {
         let ws_config = config.ws_config.clone();
         let tx = tx_relay.clone();
         thread::spawn(move || {
-            let url =
-                ws_config.listen_ip.clone() + ":" + &ws_config.listen_port.clone().to_string();
+            let url = ws_config.listen_ip.clone() + ":" + &ws_config.listen_port;
             //let factory = WsFactory::new(ws_responses, tx_pub, 0);
             let factory = WsFactory::new(ws_responses, tx, 0);
             info!("WebSocket Listening on {}", url);
@@ -223,8 +222,7 @@ fn main() {
 
     if config.http_config.enable {
         let http_config = config.http_config.clone();
-        let addr =
-            http_config.listen_ip.clone() + ":" + &http_config.listen_port.clone().to_string();
+        let addr = http_config.listen_ip.clone() + ":" + &http_config.listen_port;
         info!("Http Listening on {}", &addr);
 
         let threads: usize = config
diff --git a/cita-jsonrpc/src/mq_handler.rs b/cita-jsonrpc/src/mq_handler.rs
@@ -18,7 +18,6 @@ use jsonrpc_types::rpc_response::Output;
 use libproto::router::{MsgType, RoutingKey, SubModules};
 use libproto::Message;
 use libproto::TryFrom;
-use serde_json;
 
 #[derive(Default)]
 pub struct MqHandler {
diff --git a/cita-jsonrpc/src/response.rs b/cita-jsonrpc/src/response.rs
@@ -16,7 +16,6 @@ use futures::stream::{Collect, FuturesOrdered};
 use futures::{future::Future, sync::oneshot, Async, Poll};
 use hyper::{HeaderMap as Headers, Response as HyperResponse, StatusCode};
 use jsonrpc_types::rpc_response::Output;
-use serde_json;
 
 use crate::service_error::ServiceError;
 
diff --git a/cita-jsonrpc/src/service_error.rs b/cita-jsonrpc/src/service_error.rs
@@ -14,7 +14,6 @@
 
 use hyper::{Body, HeaderMap as Headers, Response, StatusCode};
 use jsonrpc_types::{rpc_request::RequestInfo, rpc_response::RpcFailure};
-use serde_json;
 
 use crate::response::{HyperResponseExt, IntoResponse};
 
diff --git a/cita-jsonrpc/src/soliloquy.rs b/cita-jsonrpc/src/soliloquy.rs
@@ -19,7 +19,6 @@ use jsonrpc_types::ErrorCode;
 use libproto::protos::response::Response;
 use libproto::Message;
 use libproto::Request_oneof_req::software_version;
-use serde_json;
 
 pub struct Soliloquy {
     config: Config,
diff --git a/cita-jsonrpc/src/ws_handler.rs b/cita-jsonrpc/src/ws_handler.rs
@@ -18,9 +18,7 @@ use jsonrpc_types::rpc_request::{PartialRequest, RequestInfo};
 use jsonrpc_types::rpc_response::RpcFailure;
 use jsonrpc_types::Error;
 use libproto::request::Request as ProtoRequest;
-use num_cpus;
 use pubsub::channel::Sender;
-use serde_json;
 use std::sync::Arc;
 use threadpool::ThreadPool;
 use ws::{self as ws, CloseCode, Factory, Handler};
diff --git a/cita-network/src/main.rs b/cita-network/src/main.rs
@@ -98,7 +98,6 @@ use crate::p2p_protocol::{
 };
 use crate::synchronizer::Synchronizer;
 use clap::App;
-use dotenv;
 use futures::prelude::*;
 use notify::{RecommendedWatcher, RecursiveMode, Watcher};
 use std::path::Path;
@@ -145,8 +144,7 @@ fn main() {
         .expect("Wrong config file")
         .to_str()
         .unwrap()
-        .to_string()
-        .clone();
+        .to_string();
 
     // Init config
     debug!("Config path {:?}", config_path);
diff --git a/cita-network/src/network.rs b/cita-network/src/network.rs
@@ -26,7 +26,6 @@ use libproto::snapshot::{Cmd, Resp, SnapshotResp};
 use libproto::{Message as ProtoMessage, OperateType, Response};
 use libproto::{TryFrom, TryInto};
 use pubsub::channel::{unbounded, Receiver, Sender};
-use serde_json;
 use std::iter::FromIterator;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
diff --git a/cita-network/src/node_manager.rs b/cita-network/src/node_manager.rs
diff --git a/cita-network/src/synchronizer.rs b/cita-network/src/synchronizer.rs
diff --git a/env.sh b/env.sh
diff --git a/tests/chain-executor-mock/src/main.rs b/tests/chain-executor-mock/src/main.rs
diff --git a/tools/create-genesis/src/genesis.rs b/tools/create-genesis/src/genesis.rs
diff --git a/tools/create-genesis/src/miner.rs b/tools/create-genesis/src/miner.rs
diff --git a/tools/create-genesis/src/solc.rs b/tools/create-genesis/src/solc.rs

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,7 @@ impl From<ProtoReceipt> for Receipt {`
`122`	`122`	`.collect();`
`123`	`123`
`124`	`124`	`if receipt.error.is_some() {`
`125`		`- error = Some(ReceiptError::from_proto(`
`126`		`- receipt.clone().take_error().get_error(),`
`127`		`- ));`
	`125`	`+ error = Some(ReceiptError::from_proto(receipt.get_error().get_error()));`
`128`	`126`	`}`
`129`	`127`
`130`	`128`	`Receipt::new(`