From 53d86e2a296db07075e9b45b7e43a72c8b16b73e Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Tue, 1 Aug 2023 02:49:31 -0400 Subject: [PATCH] Latest clippy --- coins/monero/src/bin/reserialize_chain.rs | 2 +- coins/monero/src/ringct/bulletproofs/scalar_vector.rs | 4 ++++ coins/monero/tests/send.rs | 2 +- coordinator/src/substrate/mod.rs | 6 +++--- coordinator/src/tributary/scanner.rs | 1 + crypto/dalek-ff-group/src/lib.rs | 2 ++ crypto/ed448/src/lib.rs | 2 ++ crypto/frost/src/nonce.rs | 2 +- crypto/frost/src/sign.rs | 2 +- crypto/transcript/src/lib.rs | 2 +- processor/src/networks/bitcoin.rs | 5 ++--- processor/src/networks/monero.rs | 4 ++-- 12 files changed, 21 insertions(+), 13 deletions(-) diff --git a/coins/monero/src/bin/reserialize_chain.rs b/coins/monero/src/bin/reserialize_chain.rs index a9291192..75e9c391 100644 --- a/coins/monero/src/bin/reserialize_chain.rs +++ b/coins/monero/src/bin/reserialize_chain.rs @@ -95,7 +95,7 @@ async fn check_block(rpc: Arc>, block_i: usize) { } let mut batch = BatchVerifier::new(block.txs.len()); - for (tx_hash, tx_res) in block.txs.into_iter().zip(all_txs.into_iter()) { + for (tx_hash, tx_res) in block.txs.into_iter().zip(all_txs) { assert_eq!( tx_res.tx_hash, hex::encode(tx_hash), diff --git a/coins/monero/src/ringct/bulletproofs/scalar_vector.rs b/coins/monero/src/ringct/bulletproofs/scalar_vector.rs index 439e093f..3596f838 100644 --- a/coins/monero/src/ringct/bulletproofs/scalar_vector.rs +++ b/coins/monero/src/ringct/bulletproofs/scalar_vector.rs @@ -12,6 +12,7 @@ use multiexp::multiexp; pub(crate) struct ScalarVector(pub(crate) Vec); macro_rules! math_op { ($Op: ident, $op: ident, $f: expr) => { + #[allow(clippy::redundant_closure_call)] impl $Op for ScalarVector { type Output = ScalarVector; fn $op(self, b: Scalar) -> ScalarVector { @@ -19,6 +20,7 @@ macro_rules! math_op { } } + #[allow(clippy::redundant_closure_call)] impl $Op for &ScalarVector { type Output = ScalarVector; fn $op(self, b: Scalar) -> ScalarVector { @@ -26,6 +28,7 @@ macro_rules! math_op { } } + #[allow(clippy::redundant_closure_call)] impl $Op for ScalarVector { type Output = ScalarVector; fn $op(self, b: ScalarVector) -> ScalarVector { @@ -34,6 +37,7 @@ macro_rules! math_op { } } + #[allow(clippy::redundant_closure_call)] impl $Op<&ScalarVector> for &ScalarVector { type Output = ScalarVector; fn $op(self, b: &ScalarVector) -> ScalarVector { diff --git a/coins/monero/tests/send.rs b/coins/monero/tests/send.rs index dfc7cf58..25c4604c 100644 --- a/coins/monero/tests/send.rs +++ b/coins/monero/tests/send.rs @@ -34,7 +34,7 @@ async fn add_inputs( .await .unwrap(); - let inputs = spendable_outputs.into_iter().zip(decoys.into_iter()).collect::>(); + let inputs = spendable_outputs.into_iter().zip(decoys).collect::>(); builder.add_inputs(&inputs); } diff --git a/coordinator/src/substrate/mod.rs b/coordinator/src/substrate/mod.rs index 7b4fa078..560e81f8 100644 --- a/coordinator/src/substrate/mod.rs +++ b/coordinator/src/substrate/mod.rs @@ -84,8 +84,7 @@ async fn handle_new_set< Ok(()) } -async fn handle_key_gen( - db: &mut D, +async fn handle_key_gen( key: &Zeroizing<::F>, processors: &Pro, serai: &Serai, @@ -215,6 +214,7 @@ async fn handle_batch_and_burns( // Handle a specific Substrate block, returning an error when it fails to get data // (not blocking / holding) +#[allow(clippy::needless_pass_by_ref_mut)] // False positive? async fn handle_block< D: Db, Fut: Future, @@ -265,7 +265,7 @@ async fn handle_block< for key_gen in serai.get_key_gen_events(hash).await? { if !SubstrateDb::::handled_event(&db.0, hash, event_id) { if let ValidatorSetsEvent::KeyGen { set, key_pair } = key_gen { - handle_key_gen(&mut db.0, key, processors, serai, &block, set, key_pair).await?; + handle_key_gen(key, processors, serai, &block, set, key_pair).await?; } else { panic!("KeyGen event wasn't KeyGen: {key_gen:?}"); } diff --git a/coordinator/src/tributary/scanner.rs b/coordinator/src/tributary/scanner.rs index 2464409d..fe562354 100644 --- a/coordinator/src/tributary/scanner.rs +++ b/coordinator/src/tributary/scanner.rs @@ -30,6 +30,7 @@ pub enum RecognizedIdType { } // Handle a specific Tributary block +#[allow(clippy::needless_pass_by_ref_mut)] // False positive? async fn handle_block( db: &mut TributaryDb, key: &Zeroizing<::F>, diff --git a/crypto/dalek-ff-group/src/lib.rs b/crypto/dalek-ff-group/src/lib.rs index c99a9d5d..e2e2839b 100644 --- a/crypto/dalek-ff-group/src/lib.rs +++ b/crypto/dalek-ff-group/src/lib.rs @@ -2,6 +2,8 @@ #![no_std] // Prevents writing new code, in what should be a simple wrapper, which requires std #![doc = include_str!("../README.md")] +#![allow(clippy::redundant_closure_call)] + use core::{ borrow::Borrow, ops::{Deref, Add, AddAssign, Sub, SubAssign, Neg, Mul, MulAssign}, diff --git a/crypto/ed448/src/lib.rs b/crypto/ed448/src/lib.rs index e596d399..57e519da 100644 --- a/crypto/ed448/src/lib.rs +++ b/crypto/ed448/src/lib.rs @@ -2,6 +2,8 @@ #![doc = include_str!("../README.md")] #![no_std] +#![allow(clippy::redundant_closure_call)] + #[macro_use] mod backend; diff --git a/crypto/frost/src/nonce.rs b/crypto/frost/src/nonce.rs index 6b156212..89b95240 100644 --- a/crypto/frost/src/nonce.rs +++ b/crypto/frost/src/nonce.rs @@ -255,7 +255,7 @@ impl BindingFactor { self.0.insert(i, IndividualBinding { commitments, binding_factors: None }); } - pub(crate) fn calculate_binding_factors(&mut self, transcript: &mut T) { + pub(crate) fn calculate_binding_factors(&mut self, transcript: &T) { for (l, binding) in self.0.iter_mut() { let mut transcript = transcript.clone(); transcript.append_message(b"participant", C::F::from(u64::from(u16::from(*l))).to_repr()); diff --git a/crypto/frost/src/sign.rs b/crypto/frost/src/sign.rs index 5f3c1b70..ac4c53a6 100644 --- a/crypto/frost/src/sign.rs +++ b/crypto/frost/src/sign.rs @@ -388,7 +388,7 @@ impl> SignMachine for AlgorithmSignMachi ); // Generate the per-signer binding factors - B.calculate_binding_factors(&mut rho_transcript); + B.calculate_binding_factors(&rho_transcript); // Merge the rho transcript back into the global one to ensure its advanced, while // simultaneously committing to everything diff --git a/crypto/transcript/src/lib.rs b/crypto/transcript/src/lib.rs index e9e99005..1f386d26 100644 --- a/crypto/transcript/src/lib.rs +++ b/crypto/transcript/src/lib.rs @@ -159,7 +159,7 @@ where // Attempt to get them marked as read #[rustversion::since(1.66)] - fn mark_read(transcript: &mut DigestTranscript) { + fn mark_read(transcript: &DigestTranscript) { // Just get a challenge from the state let mut challenge = core::hint::black_box(transcript.0.clone().finalize()); challenge.as_mut().zeroize(); diff --git a/processor/src/networks/bitcoin.rs b/processor/src/networks/bitcoin.rs index 4cfede53..40cf8eee 100644 --- a/processor/src/networks/bitcoin.rs +++ b/processor/src/networks/bitcoin.rs @@ -410,7 +410,7 @@ impl Network for Bitcoin { } let this_block_hash = block.id(); - let this_block_num = (|| async { + let this_block_num = (async { loop { match self.rpc.get_block_number(&this_block_hash).await { Ok(number) => return number, @@ -420,8 +420,7 @@ impl Network for Bitcoin { } sleep(Duration::from_secs(60)).await; } - })() - .await; + }).await; for block_num in (eventualities.block_number + 1) .. this_block_num { let block = { diff --git a/processor/src/networks/monero.rs b/processor/src/networks/monero.rs index fe0f9cbf..44da44d5 100644 --- a/processor/src/networks/monero.rs +++ b/processor/src/networks/monero.rs @@ -419,7 +419,7 @@ impl Network for Monero { .map_err(|_| NetworkError::ConnectionError) .unwrap(); - let inputs = spendable_outputs.into_iter().zip(decoys.into_iter()).collect::>(); + let inputs = spendable_outputs.into_iter().zip(decoys).collect::>(); let signable = |mut plan: Plan, tx_fee: Option<_>| { // Monero requires at least two outputs @@ -617,7 +617,7 @@ impl Network for Monero { .await .unwrap(); - let inputs = outputs.into_iter().zip(decoys.into_iter()).collect::>(); + let inputs = outputs.into_iter().zip(decoys).collect::>(); let tx = MSignableTransaction::new( protocol,