diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index db26044df..ea9e3cd87 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -59,26 +59,10 @@ jobs: run: | ./pr/.github/scripts/compare_iai.sh - # Checks that benchmarks not run in CI compile - bench-check: - name: check - runs-on: - group: Reth - steps: - - uses: actions/checkout@v3 - - name: Install toolchain - uses: dtolnay/rust-toolchain@stable - - uses: Swatinem/rust-cache@v2 - - name: Check if benchmarks build - run: cargo check --workspace --benches --all-features - bench-success: if: always() name: bench success - needs: bench-check runs-on: ubuntu-20.04 steps: - - name: Decide whether the needed jobs succeeded or failed - uses: re-actors/alls-green@release/v1 - with: - jobs: ${{ toJSON(needs) }} + # Note: This check is a dummy because we don't have any bench checks enabled. + - run: echo OK. \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acd32150d..6b6ba44b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: check - args: --all --all-features + args: --all --all-features --benches --tests - name: cargo fmt uses: actions-rs/cargo@v1 @@ -44,7 +44,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: clippy - args: --all --all-features + args: --all --all-features --benches --tests doc-lint: name: doc lint diff --git a/crates/prune/src/pruner.rs b/crates/prune/src/pruner.rs index 123e2eb34..a47a36a46 100644 --- a/crates/prune/src/pruner.rs +++ b/crates/prune/src/pruner.rs @@ -1282,10 +1282,11 @@ mod tests { .iter() .enumerate() .flat_map(|(block_number, changeset)| { - changeset.into_iter().map(move |change| (block_number, change)) + changeset.iter().map(move |change| (block_number, change)) }) .collect::>(); + #[allow(clippy::skip_while_next)] let pruned = changesets .iter() .enumerate() @@ -1308,11 +1309,13 @@ mod tests { .map(|(block_number, _)| if done { *block_number } else { block_number.saturating_sub(1) } as BlockNumber) .unwrap_or(to_block); - let pruned_changesets = - pruned_changesets.fold(BTreeMap::new(), |mut acc, (block_number, change)| { - acc.entry(block_number).or_insert_with(Vec::new).push(change); + let pruned_changesets = pruned_changesets.fold( + BTreeMap::<_, Vec<_>>::new(), + |mut acc, (block_number, change)| { + acc.entry(block_number).or_default().push(change); acc - }); + }, + ); assert_eq!( tx.table::().unwrap().len(), @@ -1409,12 +1412,13 @@ mod tests { .iter() .enumerate() .flat_map(|(block_number, changeset)| { - changeset.into_iter().flat_map(move |(address, _, entries)| { - entries.into_iter().map(move |entry| (block_number, address, entry)) + changeset.iter().flat_map(move |(address, _, entries)| { + entries.iter().map(move |entry| (block_number, address, entry)) }) }) .collect::>(); + #[allow(clippy::skip_while_next)] let pruned = changesets .iter() .enumerate() @@ -1438,9 +1442,9 @@ mod tests { .unwrap_or(to_block); let pruned_changesets = pruned_changesets.fold( - BTreeMap::new(), + BTreeMap::<_, Vec<_>>::new(), |mut acc, (block_number, address, entry)| { - acc.entry((block_number, address)).or_insert_with(Vec::new).push(entry); + acc.entry((block_number, address)).or_default().push(entry); acc }, ); @@ -1544,9 +1548,7 @@ mod tests { .inner() .get_prune_checkpoint(PrunePart::ContractLogs) .unwrap() - .and_then(|checkpoint| { - Some((checkpoint.block_number.unwrap(), checkpoint.tx_number.unwrap())) - }) + .map(|checkpoint| (checkpoint.block_number.unwrap(), checkpoint.tx_number.unwrap())) .unwrap_or_default(); // All receipts are in the end of the block @@ -1558,7 +1560,7 @@ mod tests { ((pruned_tx + 1) - unprunable) as usize ); - return done + done }; while !run_prune() {} diff --git a/crates/rpc/rpc-engine-api/src/engine_api.rs b/crates/rpc/rpc-engine-api/src/engine_api.rs index 1a670df59..eed5de58b 100644 --- a/crates/rpc/rpc-engine-api/src/engine_api.rs +++ b/crates/rpc/rpc-engine-api/src/engine_api.rs @@ -772,10 +772,10 @@ mod tests { let expected = blocks .iter() - .cloned() // filter anything after the second missing range to ensure we don't expect trailing // `None`s .filter(|b| !second_missing_range.contains(&b.number)) + .cloned() .map(|b| { if first_missing_range.contains(&b.number) { None diff --git a/crates/trie/src/trie.rs b/crates/trie/src/trie.rs index cc443d668..42522cb45 100644 --- a/crates/trie/src/trie.rs +++ b/crates/trie/src/trie.rs @@ -533,6 +533,7 @@ where } #[cfg(test)] +#[allow(clippy::mutable_key_type)] mod tests { use super::*; use crate::test_utils::{