Skip to content

Commit

Permalink
Merge branch 'main' into db/clippy-fmt-for-e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
dutterbutter authored Dec 19, 2024
2 parents cab3b98 + 1f0a4b6 commit 557c9fd
Show file tree
Hide file tree
Showing 15 changed files with 6,245 additions and 1,776 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ etc/**/*.zbin
zkout/
cache/
example.json
state.json
36 changes: 19 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ tracing-subscriber = { version = "0.3", features = [
"local-time",
] }

#########################
# Test dependencies #
#########################
httptest = "0.15.4"
tempdir = "0.3.7"
maplit = "1.0.2"
zksync-web3-rs = "0.1.1"
ethers = { version = "2.0.4", features = ["rustls"] }
test-case = "3.3.1"

#########################
# Local dependencies #
#########################
Expand Down
4 changes: 4 additions & 0 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ tracing.workspace = true
tracing-subscriber.workspace = true
tower.workspace = true
tower-http.workspace = true
flate2.workspace = true

[dev-dependencies]
tempdir.workspace = true
Loading

0 comments on commit 557c9fd

Please sign in to comment.