Skip to content
This repository was archived by the owner on Jul 5, 2024. It is now read-only.

Commit d972588

Browse files
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
1 parent 6c33c7f commit d972588

File tree

11 files changed

+81
-146
lines changed

11 files changed

+81
-146
lines changed

Cargo.lock

Lines changed: 73 additions & 128 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gadgets/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ digest = "0.7.6"
1313
strum = "0.24"
1414

1515
[dev-dependencies]
16-
rand_xorshift = "0.3"
1716
rand = "0.8"

geth-utils/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ license = "MIT OR Apache-2.0"
66

77
[build-dependencies]
88
gobuild = "0.1.0-alpha.1"
9-
log = "0.4.14"
10-
env_logger = "0.9"
119

1210
[dev-dependencies]
1311
eth-types = { path = "../eth-types" }

integration-tests/Cargo.toml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ license = "MIT OR Apache-2.0"
99
[dependencies]
1010
lazy_static = "1.4"
1111
ethers = { version = "2.0.7", features = ["ethers-solc"] }
12-
serde_json = { version = "1.0.66", features = ["unbounded_depth"]}
12+
serde_json = { version = "1.0.66", features = ["unbounded_depth"] }
1313
serde = { version = "1.0.130", features = ["derive"] }
14-
bus-mapping = { path = "../bus-mapping" , features = ["test"] }
14+
bus-mapping = { path = "../bus-mapping", features = ["test"] }
1515
eth-types = { path = "../eth-types" }
1616
zkevm-circuits = { path = "../zkevm-circuits", features = ["test-circuits"] }
1717
tokio = { version = "1.13", features = ["macros", "rt-multi-thread"] }
@@ -25,8 +25,6 @@ paste = "1.0"
2525
rand_xorshift = "0.3.0"
2626
rand_core = "0.6.4"
2727
mock = { path = "../mock" }
28-
this = "0.3.0"
29-
error = "0.1.9"
3028

3129
[dev-dependencies]
3230
pretty_assertions = "1.0.0"
@@ -46,5 +44,4 @@ glob = "0.3.1"
4644
log = "0.4.14"
4745
serde = "1.0.130"
4846
serde_json = "1.0.66"
49-
uneval = "0.2.4"
50-
thiserror = "1.0.49"
47+
thiserror = "1.0.49"

light-client-poc/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ eth-types = { path = "../eth-types" }
1919
gadgets = { path = "../gadgets" }
2020
rand_chacha = "0.3.1"
2121
rand = "0.8.5"
22-
ark-std = "0.4.0"
2322
env_logger = "0.9"
2423
ahash = "=0.8.6"
2524

testool/src/statetest/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ pub mod spec;
66
mod suite;
77
mod yaml;
88

9-
pub use executor::{geth_trace, run_test, CircuitsConfig, StateTestError};
9+
pub use executor::{geth_trace, run_test, CircuitsConfig};
1010
pub use json::JsonStateTestBuilder;
1111
pub use results::{ResultLevel, Results};
12-
pub use spec::{AccountMatch, Env, StateTest, StateTestResult};
12+
pub use spec::{AccountMatch, StateTest, StateTestResult};
1313
pub use suite::{load_statetests_suite, run_statetests_suite};
1414
pub use yaml::YamlStateTestBuilder;

testool/src/statetest/yaml.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ mod test {
413413
use super::*;
414414
use crate::{
415415
config::TestSuite,
416-
statetest::{run_test, CircuitsConfig, StateTestError},
416+
statetest::{executor::StateTestError, run_test, CircuitsConfig},
417417
};
418418
use eth_types::address;
419419

zkevm-circuits/src/evm_circuit/execution/addmod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ mod test {
243243

244244
let mut ctx = TestContext::<2, 1>::simple_ctx_with_bytecode(bytecode).unwrap();
245245
if let Some(r) = r {
246-
let mut last = ctx
246+
let last = ctx
247247
.geth_traces
248248
.first_mut()
249249
.unwrap()

zkevm-circuits/src/evm_circuit/execution/mulmod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ mod test {
179179

180180
let mut ctx = TestContext::<2, 1>::simple_ctx_with_bytecode(bytecode).unwrap();
181181
if let Some(r) = r {
182-
let mut last = ctx
182+
let last = ctx
183183
.geth_traces
184184
.first_mut()
185185
.unwrap()

zkevm-circuits/src/evm_circuit/test.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
pub use super::EvmCircuit;
2-
31
use eth_types::Word;
42
use rand::{
53
distributions::uniform::{SampleRange, SampleUniform},

0 commit comments

Comments
 (0)