fix: clippy warnning manual_is_multiple_of

JackDrogon · JackDrogon · commit 6edd3616ef2a · 2025-08-13T21:31:41.000+08:00
if blob_gas_used % DATA_GAS_PER_BLOB != 0 { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace with: `!blob_gas_used.is_multiple_of(DATA_GAS_PER_BLOB)` = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_is_multiple_of = note: `-D clippy::manual-is-multiple-of` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(clippy::manual_is_multiple_of)]` Signed-off-by: Jack Drogon <jack.xsuperman@gmail.com>
diff --git a/crates/cli/commands/src/db/checksum.rs b/crates/cli/commands/src/db/checksum.rs
@@ -111,7 +111,7 @@ impl<N: ProviderNodeTypes> TableViewer<(u64, Duration)> for ChecksumViewer<'_, N
         for (index, entry) in walker.enumerate() {
             let (k, v): (RawKey<T::Key>, RawValue<T::Value>) = entry?;
 
-            if index % 100_000 == 0 {
+            if index.is_multiple_of(100_000) {
                 info!("Hashed {index} entries.");
             }
 
diff --git a/crates/consensus/common/src/validation.rs b/crates/consensus/common/src/validation.rs
@@ -209,7 +209,7 @@ pub fn validate_4844_header_standalone<H: BlockHeader>(
         return Err(ConsensusError::ParentBeaconBlockRootMissing)
     }
 
-    if blob_gas_used % DATA_GAS_PER_BLOB != 0 {
+    if !blob_gas_used.is_multiple_of(DATA_GAS_PER_BLOB) {
         return Err(ConsensusError::BlobGasUsedNotMultipleOfBlobGasPerBlob {
             blob_gas_used,
             blob_gas_per_blob: DATA_GAS_PER_BLOB,
diff --git a/crates/era-utils/src/history.rs b/crates/era-utils/src/history.rs
@@ -370,7 +370,7 @@ where
     for (index, hash_to_number) in hash_collector.iter()?.enumerate() {
         let (hash, number) = hash_to_number?;
 
-        if index != 0 && index % interval == 0 {
+        if index != 0 && index.is_multiple_of(interval) {
             info!(target: "era::history::import", progress = %format!("{:.2}%", (index as f64 / total_headers as f64) * 100.0), "Writing headers hash index");
         }
 
diff --git a/crates/stages/stages/src/stages/hashing_account.rs b/crates/stages/stages/src/stages/hashing_account.rs
@@ -180,7 +180,7 @@ where
                 });
 
                 // Flush to ETL when channels length reaches MAXIMUM_CHANNELS
-                if !channels.is_empty() && channels.len() % MAXIMUM_CHANNELS == 0 {
+                if !channels.is_empty() && channels.len().is_multiple_of(MAXIMUM_CHANNELS) {
                     collect(&mut channels, &mut collector)?;
                 }
             }
@@ -193,7 +193,7 @@ where
             let total_hashes = collector.len();
             let interval = (total_hashes / 10).max(1);
             for (index, item) in collector.iter()?.enumerate() {
-                if index > 0 && index % interval == 0 {
+                if index > 0 && index.is_multiple_of(interval) {
                     info!(
                         target: "sync::stages::hashing_account",
                         progress = %format!("{:.2}%", (index as f64 / total_hashes as f64) * 100.0),
diff --git a/crates/stages/stages/src/stages/hashing_storage.rs b/crates/stages/stages/src/stages/hashing_storage.rs
@@ -110,7 +110,7 @@ where
                 });
 
                 // Flush to ETL when channels length reaches MAXIMUM_CHANNELS
-                if !channels.is_empty() && channels.len() % MAXIMUM_CHANNELS == 0 {
+                if !channels.is_empty() && channels.len().is_multiple_of(MAXIMUM_CHANNELS) {
                     collect(&mut channels, &mut collector)?;
                 }
             }
@@ -121,7 +121,7 @@ where
             let interval = (total_hashes / 10).max(1);
             let mut cursor = tx.cursor_dup_write::<tables::HashedStorages>()?;
             for (index, item) in collector.iter()?.enumerate() {
-                if index > 0 && index % interval == 0 {
+                if index > 0 && index.is_multiple_of(interval) {
                     info!(
                         target: "sync::stages::hashing_storage",
                         progress = %format!("{:.2}%", (index as f64 / total_hashes as f64) * 100.0),
diff --git a/crates/stages/stages/src/stages/headers.rs b/crates/stages/stages/src/stages/headers.rs
@@ -119,7 +119,7 @@ where
         for (index, header) in self.header_collector.iter()?.enumerate() {
             let (_, header_buf) = header?;
 
-            if index > 0 && index % interval == 0 && total_headers > 100 {
+            if index > 0 && index.is_multiple_of(interval) && total_headers > 100 {
                 info!(target: "sync::stages::headers", progress = %format!("{:.2}%", (index as f64 / total_headers as f64) * 100.0), "Writing headers");
             }
 
@@ -164,7 +164,7 @@ where
         for (index, hash_to_number) in self.hash_collector.iter()?.enumerate() {
             let (hash, number) = hash_to_number?;
 
-            if index > 0 && index % interval == 0 && total_headers > 100 {
+            if index > 0 && index.is_multiple_of(interval) && total_headers > 100 {
                 info!(target: "sync::stages::headers", progress = %format!("{:.2}%", (index as f64 / total_headers as f64) * 100.0), "Writing headers hash index");
             }
 
diff --git a/crates/stages/stages/src/stages/tx_lookup.rs b/crates/stages/stages/src/stages/tx_lookup.rs
@@ -154,7 +154,7 @@ where
                 let interval = (total_hashes / 10).max(1);
                 for (index, hash_to_number) in hash_collector.iter()?.enumerate() {
                     let (hash, number) = hash_to_number?;
-                    if index > 0 && index % interval == 0 {
+                    if index > 0 && index.is_multiple_of(interval) {
                         info!(
                             target: "sync::stages::transaction_lookup",
                             ?append_only,
diff --git a/crates/stages/stages/src/stages/utils.rs b/crates/stages/stages/src/stages/utils.rs
@@ -77,7 +77,7 @@ where
         let (block_number, key) = partial_key_factory(entry?);
         cache.entry(key).or_default().push(block_number);
 
-        if idx > 0 && idx % interval == 0 && total_changesets > 1000 {
+        if idx > 0 && idx.is_multiple_of(interval) && total_changesets > 1000 {
             info!(target: "sync::stages::index_history", progress = %format!("{:.4}%", (idx as f64 / total_changesets as f64) * 100.0), "Collecting indices");
         }
 
@@ -131,7 +131,7 @@ where
         let sharded_key = decode_key(k)?;
         let new_list = BlockNumberList::decompress_owned(v)?;
 
-        if index > 0 && index % interval == 0 && total_entries > 10 {
+        if index > 0 && index.is_multiple_of(interval) && total_entries > 10 {
             info!(target: "sync::stages::index_history", progress = %format!("{:.2}%", (index as f64 / total_entries as f64) * 100.0), "Writing indices");
         }
 
diff --git a/crates/storage/db-common/src/init.rs b/crates/storage/db-common/src/init.rs
@@ -484,7 +484,8 @@ fn parse_accounts(
         let GenesisAccountWithAddress { genesis_account, address } = serde_json::from_str(&line)?;
         collector.insert(address, genesis_account)?;
 
-        if !collector.is_empty() && collector.len() % AVERAGE_COUNT_ACCOUNTS_PER_GB_STATE_DUMP == 0
+        if !collector.is_empty() &&
+            collector.len().is_multiple_of(AVERAGE_COUNT_ACCOUNTS_PER_GB_STATE_DUMP)
         {
             info!(target: "reth::cli",
                 parsed_new_accounts=collector.len(),
@@ -523,7 +524,7 @@ where
 
         accounts.push((address, account));
 
-        if (index > 0 && index % AVERAGE_COUNT_ACCOUNTS_PER_GB_STATE_DUMP == 0) ||
+        if (index > 0 && index.is_multiple_of(AVERAGE_COUNT_ACCOUNTS_PER_GB_STATE_DUMP)) ||
             index == accounts_len - 1
         {
             total_inserted_accounts += accounts.len();
@@ -588,7 +589,7 @@ where
 
                 intermediate_state = Some(*state);
 
-                if total_flushed_updates % SOFT_LIMIT_COUNT_FLUSHED_UPDATES == 0 {
+                if total_flushed_updates.is_multiple_of(SOFT_LIMIT_COUNT_FLUSHED_UPDATES) {
                     info!(target: "reth::cli",
                         total_flushed_updates,
                         "Flushing trie updates"
diff --git a/crates/storage/provider/src/test_utils/blocks.rs b/crates/storage/provider/src/test_utils/blocks.rs
@@ -366,7 +366,7 @@ fn block4(
     for idx in address_range {
         let address = Address::with_last_byte(idx);
         // increase balance for every even account and destroy every odd
-        bundle_state_builder = if idx % 2 == 0 {
+        bundle_state_builder = if idx.is_multiple_of(2) {
             bundle_state_builder
                 .state_present_account_info(
                     address,
@@ -462,7 +462,7 @@ fn block5(
                     .map(|slot| (U256::from(slot), (U256::from(slot), U256::from(slot * 4))))
                     .collect(),
             );
-        bundle_state_builder = if idx % 2 == 0 {
+        bundle_state_builder = if idx.is_multiple_of(2) {
             bundle_state_builder
                 .revert_account_info(
                     number,
diff --git a/crates/trie/db/tests/post_state.rs b/crates/trie/db/tests/post_state.rs
@@ -100,14 +100,14 @@ fn account_cursor_correct_order() {
 
     let db = create_test_rw_db();
     db.update(|tx| {
-        for (key, account) in accounts.iter().filter(|x| x.0[31] % 2 == 0) {
+        for (key, account) in accounts.iter().filter(|x| x.0[31].is_multiple_of(2)) {
             tx.put::<tables::HashedAccounts>(*key, *account).unwrap();
         }
     })
     .unwrap();
 
     let mut hashed_post_state = HashedPostState::default();
-    for (hashed_address, account) in accounts.iter().filter(|x| x.0[31] % 2 != 0) {
+    for (hashed_address, account) in accounts.iter().filter(|x| !x.0[31].is_multiple_of(2)) {
         hashed_post_state.accounts.insert(*hashed_address, Some(*account));
     }
 
@@ -127,14 +127,14 @@ fn removed_accounts_are_discarded() {
 
     let db = create_test_rw_db();
     db.update(|tx| {
-        for (key, account) in accounts.iter().filter(|x| x.0[31] % 2 == 0) {
+        for (key, account) in accounts.iter().filter(|x| x.0[31].is_multiple_of(2)) {
             tx.put::<tables::HashedAccounts>(*key, *account).unwrap();
         }
     })
     .unwrap();
 
     let mut hashed_post_state = HashedPostState::default();
-    for (hashed_address, account) in accounts.iter().filter(|x| x.0[31] % 2 != 0) {
+    for (hashed_address, account) in accounts.iter().filter(|x| !x.0[31].is_multiple_of(2)) {
         hashed_post_state.accounts.insert(
             *hashed_address,
             if removed_keys.contains(hashed_address) { None } else { Some(*account) },
@@ -338,7 +338,10 @@ fn zero_value_storage_entries_are_discarded() {
         (0..10).map(|key| (B256::with_last_byte(key), U256::from(key))).collect::<BTreeMap<_, _>>(); // every even number is changed to zero value
     let post_state_storage = (0..10)
         .map(|key| {
-            (B256::with_last_byte(key), if key % 2 == 0 { U256::ZERO } else { U256::from(key) })
+            (
+                B256::with_last_byte(key),
+                if key.is_multiple_of(2) { U256::ZERO } else { U256::from(key) },
+            )
         })
         .collect::<BTreeMap<_, _>>();
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ impl<N: ProviderNodeTypes> TableViewer<(u64, Duration)> for ChecksumViewer<'_, N`
`111`	`111`	`for (index, entry) in walker.enumerate() {`
`112`	`112`	`let (k, v): (RawKey<T::Key>, RawValue<T::Value>) = entry?;`
`113`	`113`
`114`		`- if index % 100_000 == 0 {`
	`114`	`+ if index.is_multiple_of(100_000) {`
`115`	`115`	`info!("Hashed {index} entries.");`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ pub fn validate_4844_header_standalone<H: BlockHeader>(`
`209`	`209`	`return Err(ConsensusError::ParentBeaconBlockRootMissing)`
`210`	`210`	`}`
`211`	`211`
`212`		`- if blob_gas_used % DATA_GAS_PER_BLOB != 0 {`
	`212`	`+ if !blob_gas_used.is_multiple_of(DATA_GAS_PER_BLOB) {`
`213`	`213`	`return Err(ConsensusError::BlobGasUsedNotMultipleOfBlobGasPerBlob {`
`214`	`214`	`blob_gas_used,`
`215`	`215`	`blob_gas_per_blob: DATA_GAS_PER_BLOB,`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ where`
`370`	`370`	`for (index, hash_to_number) in hash_collector.iter()?.enumerate() {`
`371`	`371`	`let (hash, number) = hash_to_number?;`
`372`	`372`
`373`		`- if index != 0 && index % interval == 0 {`
	`373`	`+ if index != 0 && index.is_multiple_of(interval) {`
`374`	`374`	`info!(target: "era::history::import", progress = %format!("{:.2}%", (index as f64 / total_headers as f64) * 100.0), "Writing headers hash index");`
`375`	`375`	`}`
`376`	`376`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ where`
`119`	`119`	`for (index, header) in self.header_collector.iter()?.enumerate() {`
`120`	`120`	`let (_, header_buf) = header?;`
`121`	`121`
`122`		`- if index > 0 && index % interval == 0 && total_headers > 100 {`
	`122`	`+ if index > 0 && index.is_multiple_of(interval) && total_headers > 100 {`
`123`	`123`	`info!(target: "sync::stages::headers", progress = %format!("{:.2}%", (index as f64 / total_headers as f64) * 100.0), "Writing headers");`
`124`	`124`	`}`
`125`	`125`
`@@ -164,7 +164,7 @@ where`
`164`	`164`	`for (index, hash_to_number) in self.hash_collector.iter()?.enumerate() {`
`165`	`165`	`let (hash, number) = hash_to_number?;`
`166`	`166`
`167`		`- if index > 0 && index % interval == 0 && total_headers > 100 {`
	`167`	`+ if index > 0 && index.is_multiple_of(interval) && total_headers > 100 {`
`168`	`168`	`info!(target: "sync::stages::headers", progress = %format!("{:.2}%", (index as f64 / total_headers as f64) * 100.0), "Writing headers hash index");`
`169`	`169`	`}`
`170`	`170`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ where`
`77`	`77`	`let (block_number, key) = partial_key_factory(entry?);`
`78`	`78`	`cache.entry(key).or_default().push(block_number);`
`79`	`79`
`80`		`- if idx > 0 && idx % interval == 0 && total_changesets > 1000 {`
	`80`	`+ if idx > 0 && idx.is_multiple_of(interval) && total_changesets > 1000 {`
`81`	`81`	`info!(target: "sync::stages::index_history", progress = %format!("{:.4}%", (idx as f64 / total_changesets as f64) * 100.0), "Collecting indices");`
`82`	`82`	`}`
`83`	`83`
`@@ -131,7 +131,7 @@ where`
`131`	`131`	`let sharded_key = decode_key(k)?;`
`132`	`132`	`let new_list = BlockNumberList::decompress_owned(v)?;`
`133`	`133`
`134`		`- if index > 0 && index % interval == 0 && total_entries > 10 {`
	`134`	`+ if index > 0 && index.is_multiple_of(interval) && total_entries > 10 {`
`135`	`135`	`info!(target: "sync::stages::index_history", progress = %format!("{:.2}%", (index as f64 / total_entries as f64) * 100.0), "Writing indices");`
`136`	`136`	`}`
`137`	`137`