From 26b1ffa92aa2aca6712284b03c3323458cfbe9df Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Tue, 18 Jul 2023 14:06:27 +0200 Subject: [PATCH] chore: make clippy happy (#3827) --- bin/reth/src/init.rs | 1 + bin/reth/src/stage/dump/execution.rs | 2 +- bin/reth/src/stage/dump/mod.rs | 2 +- crates/consensus/beacon/src/engine/sync.rs | 2 +- crates/primitives/src/hex_bytes.rs | 2 +- crates/revm/revm-inspectors/src/tracing/mod.rs | 6 +++--- crates/rlp/benches/bench.rs | 2 +- crates/rpc/rpc-builder/tests/it/utils.rs | 2 +- crates/rpc/rpc-types/src/eth/fee.rs | 5 +---- crates/trie/src/hashed_cursor/post_state.rs | 3 +-- 10 files changed, 12 insertions(+), 15 deletions(-) diff --git a/bin/reth/src/init.rs b/bin/reth/src/init.rs index 10b4fa14d8..a70949dbbe 100644 --- a/bin/reth/src/init.rs +++ b/bin/reth/src/init.rs @@ -190,6 +190,7 @@ mod tests { }; use std::collections::HashMap; + #[allow(clippy::type_complexity)] fn collect_table_entries( tx: &>::TX, ) -> Result, InitDatabaseError> diff --git a/bin/reth/src/stage/dump/execution.rs b/bin/reth/src/stage/dump/execution.rs index 9200065d55..b2d7bbed32 100644 --- a/bin/reth/src/stage/dump/execution.rs +++ b/bin/reth/src/stage/dump/execution.rs @@ -35,7 +35,7 @@ pub(crate) async fn dump_execution_stage( /// Imports all the tables that can be copied over a range. fn import_tables_with_range( output_db: &DatabaseEnv, - db_tool: &mut DbTool<'_, DB>, + db_tool: &DbTool<'_, DB>, from: u64, to: u64, ) -> eyre::Result<()> { diff --git a/bin/reth/src/stage/dump/mod.rs b/bin/reth/src/stage/dump/mod.rs index 14c5fd2590..5e7206cf1a 100644 --- a/bin/reth/src/stage/dump/mod.rs +++ b/bin/reth/src/stage/dump/mod.rs @@ -131,7 +131,7 @@ pub(crate) fn setup( from: u64, to: u64, output_db: &PathBuf, - db_tool: &mut DbTool<'_, DB>, + db_tool: &DbTool<'_, DB>, ) -> eyre::Result<(DatabaseEnv, u64)> { assert!(from < to, "FROM block should be bigger than TO block."); diff --git a/crates/consensus/beacon/src/engine/sync.rs b/crates/consensus/beacon/src/engine/sync.rs index 02da63d5ae..ba988f1be8 100644 --- a/crates/consensus/beacon/src/engine/sync.rs +++ b/crates/consensus/beacon/src/engine/sync.rs @@ -325,7 +325,7 @@ struct OrderedSealedBlock(SealedBlock); impl PartialOrd for OrderedSealedBlock { fn partial_cmp(&self, other: &Self) -> Option { - self.0.number.partial_cmp(&other.0.number) + Some(self.cmp(other)) } } diff --git a/crates/primitives/src/hex_bytes.rs b/crates/primitives/src/hex_bytes.rs index 322b9ff04e..0e2db39e55 100644 --- a/crates/primitives/src/hex_bytes.rs +++ b/crates/primitives/src/hex_bytes.rs @@ -328,7 +328,7 @@ mod tests { assert_eq!(b, vec[..]); assert_eq!(vec[..], b); - let wrong_vec = vec![1, 3, 52, 137]; + let wrong_vec = [1, 3, 52, 137]; assert_ne!(b, wrong_vec[..]); assert_ne!(wrong_vec[..], b); } diff --git a/crates/revm/revm-inspectors/src/tracing/mod.rs b/crates/revm/revm-inspectors/src/tracing/mod.rs index 53a26f765a..fe6c5b8609 100644 --- a/crates/revm/revm-inspectors/src/tracing/mod.rs +++ b/crates/revm/revm-inspectors/src/tracing/mod.rs @@ -236,7 +236,7 @@ impl TracingInspector { /// /// This expects an existing [CallTrace], in other words, this panics if not within the context /// of a call. - fn start_step(&mut self, interp: &mut Interpreter, data: &mut EVMData<'_, DB>) { + fn start_step(&mut self, interp: &Interpreter, data: &EVMData<'_, DB>) { let trace_idx = self.last_trace_idx(); let trace = &mut self.traces.arena[trace_idx]; @@ -283,8 +283,8 @@ impl TracingInspector { /// Invoked on [Inspector::step_end]. fn fill_step_on_step_end( &mut self, - interp: &mut Interpreter, - data: &mut EVMData<'_, DB>, + interp: &Interpreter, + data: &EVMData<'_, DB>, status: InstructionResult, ) { let StackStep { trace_idx, step_idx } = diff --git a/crates/rlp/benches/bench.rs b/crates/rlp/benches/bench.rs index abb70c7eb0..e696951831 100644 --- a/crates/rlp/benches/bench.rs +++ b/crates/rlp/benches/bench.rs @@ -48,7 +48,7 @@ fn bench_decode(c: &mut Criterion) { }); c.bench_function("decode_u256", |b| { b.iter(|| { - let data = vec![ + let data = [ 0xa0, 0x80, 0x90, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0, 0x09, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xf0, diff --git a/crates/rpc/rpc-builder/tests/it/utils.rs b/crates/rpc/rpc-builder/tests/it/utils.rs index 0b111b33cc..7869f61574 100644 --- a/crates/rpc/rpc-builder/tests/it/utils.rs +++ b/crates/rpc/rpc-builder/tests/it/utils.rs @@ -30,7 +30,7 @@ pub async fn launch_auth(secret: JwtSecret) -> AuthServerHandle { MAINNET.clone(), beacon_engine_handle, spawn_test_payload_service().into(), - Box::new(TokioTaskExecutor::default()), + Box::::default(), ); let module = AuthRpcModule::new(engine_api); module.start_server(config).await.unwrap() diff --git a/crates/rpc/rpc-types/src/eth/fee.rs b/crates/rpc/rpc-types/src/eth/fee.rs index 6463e7b433..c7f93f6eaf 100644 --- a/crates/rpc/rpc-types/src/eth/fee.rs +++ b/crates/rpc/rpc-types/src/eth/fee.rs @@ -12,10 +12,7 @@ pub struct TxGasAndReward { impl PartialOrd for TxGasAndReward { fn partial_cmp(&self, other: &Self) -> Option { - // compare only the reward - // see: - // - self.reward.partial_cmp(&other.reward) + Some(self.cmp(other)) } } diff --git a/crates/trie/src/hashed_cursor/post_state.rs b/crates/trie/src/hashed_cursor/post_state.rs index 662a71163a..c5418bc692 100644 --- a/crates/trie/src/hashed_cursor/post_state.rs +++ b/crates/trie/src/hashed_cursor/post_state.rs @@ -885,8 +885,7 @@ mod tests { let tx = db.tx().unwrap(); let factory = HashedPostStateCursorFactory::new(&tx, &hashed_post_state); let expected = - [(address, db_storage.into_iter().chain(post_state_storage.into_iter()).collect())] - .into_iter(); + [(address, db_storage.into_iter().chain(post_state_storage).collect())].into_iter(); assert_storage_cursor_order(&factory, expected); }