fix error due to rebase

privacy-scaling-explorations · Jan 26, 2024 · d0d3c4a · d0d3c4a
1 parent 2e2625c
commit d0d3c4a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 149 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bus-mapping/src/precompile.rs b/bus-mapping/src/precompile.rs
@@ -2,7 +2,7 @@
 
 use eth_types::{
     evm_types::{GasCost, OpcodeId},
-    Address, Bytecode, Word,
+    Address, Bytecode, ToBigEndian, Word,
 };
 #[cfg(not(target_arch = "wasm32"))]
 use revm_precompile::{Precompile, PrecompileError, Precompiles};

diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_precompile.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_precompile.rs
@@ -219,7 +219,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGPrecompileGadget<F> {
 #[cfg(test)]
 mod test {
     use crate::test_util::CircuitTestBuilder;
-    use bus_mapping::{evm::PrecompileCallArgs, precompile::PrecompileCalls};
+    use bus_mapping::precompile::{PrecompileCallArgs, PrecompileCalls};
     use eth_types::{
         bytecode,
         evm_types::{GasCost, OpcodeId},

diff --git a/zkevm-circuits/src/evm_circuit/execution/precompiles/ecrecover.rs b/zkevm-circuits/src/evm_circuit/execution/precompiles/ecrecover.rs
@@ -281,8 +281,8 @@ impl<F: Field> ExecutionGadget<F> for EcrecoverGadget<F> {
 #[cfg(test)]
 mod test {
     use bus_mapping::{
-        evm::{OpcodeId, PrecompileCallArgs},
-        precompile::PrecompileCalls,
+        evm::OpcodeId,
+        precompile::{PrecompileCallArgs, PrecompileCalls},
     };
     use eth_types::{bytecode, word, ToWord};
     use mock::TestContext;

diff --git a/zkevm-circuits/src/evm_circuit/execution/precompiles/identity.rs b/zkevm-circuits/src/evm_circuit/execution/precompiles/identity.rs
@@ -159,8 +159,8 @@ impl<F: Field> ExecutionGadget<F> for IdentityGadget<F> {
 #[cfg(test)]
 mod test {
     use bus_mapping::{
-        evm::{OpcodeId, PrecompileCallArgs},
-        precompile::PrecompileCalls,
+        evm::OpcodeId,
+        precompile::{PrecompileCallArgs, PrecompileCalls},
     };
     use eth_types::{bytecode, word, ToWord};
     use itertools::Itertools;