Merge branch 'db/multi-platform-docker' of github.com:matter-labs/anv…

…il-zksync into db/multi-platform-docker
matter-labs · Dec 19, 2024 · 3c9c190 · 3c9c190
2 parents 05e247e + fbdef82
commit 3c9c190
Show file tree

Hide file tree

Showing 20 changed files with 6,307 additions and 1,795 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ etc/**/*.zbin
 zkout/
 cache/
 example.json
+state.json
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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    #
 #########################

diff --git a/Makefile b/Makefile
@@ -39,8 +39,12 @@ rust-doc:
 # Lint checks for Rust code
 lint:
 	cd e2e-tests && yarn && yarn lint && yarn fmt && yarn typecheck
+	cd e2e-tests-rust && cargo fmt --all -- --check
+	cd spec-tests && cargo fmt --all -- --check
 	cargo fmt --all -- --check
 	cargo clippy --tests -p anvil-zksync -Zunstable-options -- -D warnings --allow clippy::unwrap_used
+	cd e2e-tests-rust && cargo clippy --tests -Zunstable-options -- -D warnings --allow clippy::unwrap_used
+	cd spec-tests && cargo clippy --tests -Zunstable-options -- -D warnings --allow clippy::unwrap_used
 
 # Fix lint errors for Rust code
 lint-fix:

diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,3 +21,4 @@ etc/**/*.zbin @@
     zkout/
     cache/
     example.json
+    state.json