From e43baa4b8b18a6918860a854b4247bcd16024c2f Mon Sep 17 00:00:00 2001 From: Weiliang Li Date: Tue, 12 Nov 2019 11:28:45 +0900 Subject: [PATCH] fix some clippy warnings --- Cargo.toml | 2 +- examples/network/connection.rs | 2 +- hbbft_testing/src/lib.rs | 2 +- src/dynamic_honey_badger/dynamic_honey_badger.rs | 2 +- src/dynamic_honey_badger/votes.rs | 2 +- src/threshold_decrypt.rs | 2 +- tests/dynamic_honey_badger.rs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8284514..0342e31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ rand_derive = "0.5.0" reed-solomon-erasure = "3.1.1" serde = { version = "1.0.102", features = ["derive", "rc"] } threshold_crypto = { rev = "624eeee", git = "https://github.com/poanetwork/threshold_crypto" } -tiny-keccak = { version = "2.0.0", features = ["sha3"]} +tiny-keccak = { version = "2.0.1", features = ["sha3"]} [dev-dependencies] colored = "1.9.0" diff --git a/examples/network/connection.rs b/examples/network/connection.rs index 200aa5b..9fdb00e 100644 --- a/examples/network/connection.rs +++ b/examples/network/connection.rs @@ -40,7 +40,7 @@ pub fn make( } else { TcpStream::connect(address).expect("failed to connect") }; - Connection::new(tcp_conn, there_str.to_string()) + Connection::new(tcp_conn, there_str) }) .collect(); (here_str, connections) diff --git a/hbbft_testing/src/lib.rs b/hbbft_testing/src/lib.rs index 4f93285..5042c60 100644 --- a/hbbft_testing/src/lib.rs +++ b/hbbft_testing/src/lib.rs @@ -272,7 +272,7 @@ where for fault in &step.fault_log.0 { if nodes.get(&fault.node_id).map_or(false, |n| !n.is_faulty()) { return Err(CrankError::Fault { - reported_by: stepped_id.clone(), + reported_by: stepped_id, faulty_id: fault.node_id.clone(), fault_kind: fault.kind.clone(), }); diff --git a/src/dynamic_honey_badger/dynamic_honey_badger.rs b/src/dynamic_honey_badger/dynamic_honey_badger.rs index 0a52afd..6f60bed 100644 --- a/src/dynamic_honey_badger/dynamic_honey_badger.rs +++ b/src/dynamic_honey_badger/dynamic_honey_badger.rs @@ -140,7 +140,7 @@ where } = join_plan; let new_pub_keys_opt = match change { ChangeState::InProgress(Change::EncryptionSchedule(..)) | ChangeState::None => None, - ChangeState::InProgress(Change::NodeChange(pks)) => Some(pks.clone()), + ChangeState::InProgress(Change::NodeChange(pks)) => Some(pks), ChangeState::Complete(change) => { let valid = match change { Change::EncryptionSchedule(schedule) => schedule == params.encryption_schedule, diff --git a/src/dynamic_honey_badger/votes.rs b/src/dynamic_honey_badger/votes.rs index 55bfa35..e40d114 100644 --- a/src/dynamic_honey_badger/votes.rs +++ b/src/dynamic_honey_badger/votes.rs @@ -41,7 +41,7 @@ where VoteCounter { our_id, secret_key, - pub_keys: pub_keys.clone(), + pub_keys, era, pending: BTreeMap::new(), committed: BTreeMap::new(), diff --git a/src/threshold_decrypt.rs b/src/threshold_decrypt.rs index 6b58a37..0f541fe 100644 --- a/src/threshold_decrypt.rs +++ b/src/threshold_decrypt.rs @@ -140,7 +140,7 @@ impl ThresholdDecrypt { return Err(Error::MultipleInputs(Box::new(ct))); } if !ct.verify() { - return Err(Error::InvalidCiphertext(Box::new(ct.clone()))); + return Err(Error::InvalidCiphertext(Box::new(ct))); } self.ciphertext = Some(ct); Ok(()) diff --git a/tests/dynamic_honey_badger.rs b/tests/dynamic_honey_badger.rs index 1d91836..3bd67f1 100644 --- a/tests/dynamic_honey_badger.rs +++ b/tests/dynamic_honey_badger.rs @@ -157,7 +157,7 @@ fn do_drop_and_re_add(cfg: TestConfig) { let mut awaiting_apply_new_subset: BTreeSet<_> = correct_nodes.clone(); let mut awaiting_apply_old_subset: BTreeSet<_> = correct_nodes.clone(); let mut awaiting_apply_old_subset_input: BTreeSet<_> = non_rm_nodes.clone(); - let mut awaiting_apply_old_subset_in_progress: BTreeSet<_> = non_rm_nodes.clone(); + let mut awaiting_apply_old_subset_in_progress: BTreeSet<_> = non_rm_nodes; let mut expected_outputs: BTreeMap<_, BTreeSet<_>> = correct_nodes .iter() .map(|id| (id, (0..cfg.total_txs).collect()))