diff --git a/compiler_tester/Cargo.toml b/compiler_tester/Cargo.toml index 72d1aac5..2a46b6a4 100644 --- a/compiler_tester/Cargo.toml +++ b/compiler_tester/Cargo.toml @@ -43,7 +43,6 @@ evm = { git = "https://github.com/rust-ethereum/evm", branch = "master" } zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly", branch = "v1.5.0" } zkevm_opcode_defs = { git = "https://github.com/matter-labs/era-zkevm_opcode_defs", branch = "v1.5.0" } zkevm_tester = { git = "https://github.com/matter-labs/era-zkevm_tester", branch = "v1.5.0" } -#zkevm_tester = { path = "../../era-zkevm_tester" } vm2 = { git = "https://github.com/matter-labs/vm2", optional = true } diff --git a/compiler_tester/src/vm/eravm/deployers/system_contract_deployer.rs b/compiler_tester/src/vm/eravm/deployers/system_contract_deployer.rs index 3f620323..21df6acc 100644 --- a/compiler_tester/src/vm/eravm/deployers/system_contract_deployer.rs +++ b/compiler_tester/src/vm/eravm/deployers/system_contract_deployer.rs @@ -211,15 +211,13 @@ impl EraVMDeployer for SystemContractDeployer { calldata.extend(init_code); calldata.extend(constructor_calldata); - let result = vm.execute::( + vm.execute::( test_name, entry_address, caller, Some(context_u128_value), calldata, Some(vm_launch_option), - ); - - result + ) } } diff --git a/compiler_tester/src/vm/eravm/mod.rs b/compiler_tester/src/vm/eravm/mod.rs index 120a4ad7..5d3df9d4 100644 --- a/compiler_tester/src/vm/eravm/mod.rs +++ b/compiler_tester/src/vm/eravm/mod.rs @@ -19,7 +19,6 @@ use std::time::Duration; use std::time::Instant; use colored::Colorize; -use web3::ethabi::Hash; use crate::compilers::downloader::Downloader as CompilerDownloader; use crate::vm::execution_result::ExecutionResult; diff --git a/fuzzer/Cargo.toml b/fuzzer/Cargo.toml index 6699be08..ee74dde5 100644 --- a/fuzzer/Cargo.toml +++ b/fuzzer/Cargo.toml @@ -27,7 +27,6 @@ semver = { version = "1.0", features = ["serde"] } zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly", branch = "v1.5.0" } zkevm_tester = { git = "https://github.com/matter-labs/era-zkevm_tester", branch = "v1.5.0" } -#zkevm_tester = { path = "../../era-zkevm_tester" } era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "v1.5.0" } era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "v1.5.0" }