clippy fixes

bin/mpt-test/src/circuit/witness.rs

@@ -7,7 +7,7 @@ use std::{
     time::Duration,
 };
 
-use ethers::core::utils;
+
 
 use eth_types::{Field, ToScalar};
 

zkevm-circuits/src/mpt_circuit/account_leaf.rs

@@ -1,5 +1,5 @@
 use eth_types::{Field, OpsIdentity, U256};
-use gadgets::util::{pow, xor, Scalar};
+use gadgets::util::{pow, Scalar};
 use halo2_proofs::{
     circuit::Value,
     plonk::{Error, Expression, VirtualCells},

zkevm-circuits/src/mpt_circuit/helpers.rs

@@ -615,6 +615,7 @@ impl<F: Field> ParentData<F> {
         parent_data
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub(crate) fn store<MB: MemoryBank<F, MptCellType>>(
         cb: &mut MPTConstraintBuilder<F>,
         memory: &mut MB,
@@ -1454,14 +1455,12 @@ impl<F: Field> WrongExtNodeGadget<F> {
             .0;
 
         let mut mult = key_data.mult;
-        if !key_data.is_odd {
-            if key_data.num_nibbles > 1 {
-                let iters = (key_data.num_nibbles - 1 - 1) / 2; // -1 because of the branch nibble, -1 because of being odd
-                mult = F::one();
+        if !key_data.is_odd && key_data.num_nibbles > 1 {
+            let iters = (key_data.num_nibbles - 1 - 1) / 2; // -1 because of the branch nibble, -1 because of being odd
+            mult = F::one();
 
-                for _ in 0..iters {
-                    mult = mult * region.key_r;
-                }
+            for _ in 0..iters {
+                mult *= region.key_r;
             }
         }
         let _ = self.mult_without_branch_nibble.assign(region, offset, mult);