Dependency cleaning round (#1741)

### Description We removed the warning message shown during the project build. ``` warning: the following packages contain code that will be rejected by a future version of Rust: traitobject v0.1.0 note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 2` ``` The message is caused by an unused dependency introduced during #1615 ### Issue Link None ### Type of change - [x] Bug fix (non-breaking change which fixes an issue) ### Contents - Removed some unused dependencies - Removed some unused imports ### How Has This Been Tested? Local build on all targets
privacy-scaling-explorations · Jan 23, 2024 · dd0c6e7 · dd0c6e7
1 parent 6c33c7f
commit dd0c6e7
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 144 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gadgets/Cargo.toml b/gadgets/Cargo.toml
@@ -13,5 +13,4 @@ digest = "0.7.6"
 strum = "0.24"
 
 [dev-dependencies]
-rand_xorshift = "0.3"
 rand = "0.8"
diff --git a/geth-utils/Cargo.toml b/geth-utils/Cargo.toml
@@ -6,8 +6,6 @@ license = "MIT OR Apache-2.0"
 
 [build-dependencies]
 gobuild = "0.1.0-alpha.1"
-log = "0.4.14"
-env_logger = "0.9"
 
 [dev-dependencies]
 eth-types = { path = "../eth-types" }

diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -9,9 +9,9 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 lazy_static = "1.4"
 ethers = { version = "2.0.7", features = ["ethers-solc"] }
-serde_json = { version = "1.0.66", features = ["unbounded_depth"]}
+serde_json = { version = "1.0.66", features = ["unbounded_depth"] }
 serde = { version = "1.0.130", features = ["derive"] }
-bus-mapping = { path = "../bus-mapping" , features = ["test"] }
+bus-mapping = { path = "../bus-mapping", features = ["test"] }
 eth-types = { path = "../eth-types" }
 zkevm-circuits = { path = "../zkevm-circuits", features = ["test-circuits"] }
 tokio = { version = "1.13", features = ["macros", "rt-multi-thread"] }
@@ -25,8 +25,6 @@ paste = "1.0"
 rand_xorshift = "0.3.0"
 rand_core = "0.6.4"
 mock = { path = "../mock" }
-this = "0.3.0"
-error = "0.1.9"
 
 [dev-dependencies]
 pretty_assertions = "1.0.0"
@@ -46,5 +44,4 @@ glob = "0.3.1"
 log = "0.4.14"
 serde = "1.0.130"
 serde_json = "1.0.66"
-uneval = "0.2.4"
-thiserror = "1.0.49"
+thiserror = "1.0.49"
diff --git a/light-client-poc/Cargo.toml b/light-client-poc/Cargo.toml
@@ -19,7 +19,6 @@ eth-types = { path = "../eth-types" }
 gadgets = { path = "../gadgets" }
 rand_chacha = "0.3.1"
 rand = "0.8.5"
-ark-std = "0.4.0"
 env_logger = "0.9"
 ahash = "=0.8.6"
 

diff --git a/testool/src/statetest/mod.rs b/testool/src/statetest/mod.rs
@@ -6,9 +6,9 @@ pub mod spec;
 mod suite;
 mod yaml;
 
-pub use executor::{geth_trace, run_test, CircuitsConfig, StateTestError};
+pub use executor::{geth_trace, run_test, CircuitsConfig};
 pub use json::JsonStateTestBuilder;
 pub use results::{ResultLevel, Results};
-pub use spec::{AccountMatch, Env, StateTest, StateTestResult};
+pub use spec::{AccountMatch, StateTest, StateTestResult};
 pub use suite::{load_statetests_suite, run_statetests_suite};
 pub use yaml::YamlStateTestBuilder;
diff --git a/testool/src/statetest/yaml.rs b/testool/src/statetest/yaml.rs
@@ -413,7 +413,7 @@ mod test {
     use super::*;
     use crate::{
         config::TestSuite,
-        statetest::{run_test, CircuitsConfig, StateTestError},
+        statetest::{executor::StateTestError, run_test, CircuitsConfig},
     };
     use eth_types::address;
 

diff --git a/zkevm-circuits/src/evm_circuit/execution/addmod.rs b/zkevm-circuits/src/evm_circuit/execution/addmod.rs
@@ -243,7 +243,7 @@ mod test {
 
         let mut ctx = TestContext::<2, 1>::simple_ctx_with_bytecode(bytecode).unwrap();
         if let Some(r) = r {
-            let mut last = ctx
+            let last = ctx
                 .geth_traces
                 .first_mut()
                 .unwrap()

diff --git a/zkevm-circuits/src/evm_circuit/execution/mulmod.rs b/zkevm-circuits/src/evm_circuit/execution/mulmod.rs
@@ -179,7 +179,7 @@ mod test {
 
         let mut ctx = TestContext::<2, 1>::simple_ctx_with_bytecode(bytecode).unwrap();
         if let Some(r) = r {
-            let mut last = ctx
+            let last = ctx
                 .geth_traces
                 .first_mut()
                 .unwrap()

diff --git a/zkevm-circuits/src/evm_circuit/test.rs b/zkevm-circuits/src/evm_circuit/test.rs
@@ -1,5 +1,3 @@
-pub use super::EvmCircuit;
-
 use eth_types::Word;
 use rand::{
     distributions::uniform::{SampleRange, SampleUniform},

diff --git a/zkevm-circuits/src/evm_circuit/util.rs b/zkevm-circuits/src/evm_circuit/util.rs
@@ -1,5 +1,4 @@
 pub use crate::util::{
-    query_expression,
     word::{Word, WordExpr},
     Challenges, Expr,
 };