From 6e6b8c16c28460a893ca04b50cf3921240d63e85 Mon Sep 17 00:00:00 2001 From: perekopskiy Date: Tue, 10 Sep 2024 17:25:28 +0300 Subject: [PATCH] Clean up dependencies --- Cargo.lock | 19 ------------------- core/bin/external_node/Cargo.toml | 1 - core/lib/circuit_breaker/Cargo.toml | 3 --- core/lib/contract_verifier/Cargo.toml | 1 - core/lib/da_client/Cargo.toml | 4 ---- core/lib/db_connection/Cargo.toml | 1 - core/lib/tee_verifier/Cargo.toml | 3 --- core/lib/utils/Cargo.toml | 1 - core/lib/zksync_core_leftovers/Cargo.toml | 2 -- core/node/consistency_checker/Cargo.toml | 1 - core/node/db_pruner/Cargo.toml | 1 - core/node/fee_model/Cargo.toml | 1 - core/node/node_framework/Cargo.toml | 2 -- core/node/proof_data_handler/Cargo.toml | 1 - 14 files changed, 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ff1e44348b6..b07724e23fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8143,7 +8143,6 @@ name = "zksync_circuit_breaker" version = "0.1.0" dependencies = [ "anyhow", - "assert_matches", "async-trait", "thiserror", "tokio", @@ -8398,7 +8397,6 @@ dependencies = [ "zksync_contracts", "zksync_dal", "zksync_eth_client", - "zksync_eth_sender", "zksync_health_check", "zksync_l1_contract_interface", "zksync_node_genesis", @@ -8465,7 +8463,6 @@ dependencies = [ "zksync_config", "zksync_contracts", "zksync_dal", - "zksync_env_config", "zksync_queued_job_processor", "zksync_types", "zksync_utils", @@ -8493,9 +8490,7 @@ dependencies = [ "serde_yaml", "tokio", "zksync_config", - "zksync_dal", "zksync_env_config", - "zksync_node_genesis", "zksync_protobuf", "zksync_protobuf_config", ] @@ -8524,9 +8519,6 @@ dependencies = [ "anyhow", "async-trait", "serde", - "tracing", - "zksync_config", - "zksync_types", ] [[package]] @@ -8597,7 +8589,6 @@ dependencies = [ "tracing", "vise", "zksync_basic_types", - "zksync_health_check", ] [[package]] @@ -8721,7 +8712,6 @@ dependencies = [ "envy", "futures 0.3.28", "rustc_version", - "semver", "serde", "serde_json", "tempfile", @@ -9103,7 +9093,6 @@ dependencies = [ "chrono", "serde", "serde_json", - "test-casing", "test-log", "tokio", "tracing", @@ -9130,7 +9119,6 @@ dependencies = [ "zksync_config", "zksync_dal", "zksync_eth_client", - "zksync_node_test_utils", "zksync_types", "zksync_utils", "zksync_web3_decl", @@ -9164,7 +9152,6 @@ dependencies = [ "zksync_da_dispatcher", "zksync_dal", "zksync_db_connection", - "zksync_env_config", "zksync_eth_client", "zksync_eth_sender", "zksync_eth_watch", @@ -9183,7 +9170,6 @@ dependencies = [ "zksync_node_sync", "zksync_object_store", "zksync_proof_data_handler", - "zksync_protobuf_config", "zksync_queued_job_processor", "zksync_reorg_detector", "zksync_state", @@ -9343,7 +9329,6 @@ dependencies = [ "zksync_multivm", "zksync_object_store", "zksync_prover_interface", - "zksync_tee_verifier", "zksync_types", ] @@ -9657,13 +9642,10 @@ dependencies = [ "zksync_config", "zksync_contracts", "zksync_crypto_primitives", - "zksync_dal", - "zksync_db_connection", "zksync_merkle_tree", "zksync_multivm", "zksync_object_store", "zksync_prover_interface", - "zksync_queued_job_processor", "zksync_types", "zksync_utils", ] @@ -9746,7 +9728,6 @@ dependencies = [ "bincode", "futures 0.3.28", "hex", - "itertools 0.10.5", "num", "once_cell", "rand 0.8.5", diff --git a/core/bin/external_node/Cargo.toml b/core/bin/external_node/Cargo.toml index 498b11b279b..a1d3951ff3d 100644 --- a/core/bin/external_node/Cargo.toml +++ b/core/bin/external_node/Cargo.toml @@ -59,7 +59,6 @@ envy.workspace = true url.workspace = true clap = { workspace = true, features = ["derive"] } serde_json.workspace = true -semver.workspace = true tracing.workspace = true [dev-dependencies] diff --git a/core/lib/circuit_breaker/Cargo.toml b/core/lib/circuit_breaker/Cargo.toml index 9bc00b475d4..926002e561c 100644 --- a/core/lib/circuit_breaker/Cargo.toml +++ b/core/lib/circuit_breaker/Cargo.toml @@ -19,6 +19,3 @@ tokio = { workspace = true, features = ["time"] } anyhow.workspace = true async-trait.workspace = true tracing.workspace = true - -[dev-dependencies] -assert_matches.workspace = true diff --git a/core/lib/contract_verifier/Cargo.toml b/core/lib/contract_verifier/Cargo.toml index 2803e3bb418..580982c9a70 100644 --- a/core/lib/contract_verifier/Cargo.toml +++ b/core/lib/contract_verifier/Cargo.toml @@ -13,7 +13,6 @@ categories.workspace = true [dependencies] zksync_types.workspace = true zksync_dal.workspace = true -zksync_env_config.workspace = true zksync_config.workspace = true zksync_contracts.workspace = true zksync_queued_job_processor.workspace = true diff --git a/core/lib/da_client/Cargo.toml b/core/lib/da_client/Cargo.toml index 589a077d4bf..a68d715eb57 100644 --- a/core/lib/da_client/Cargo.toml +++ b/core/lib/da_client/Cargo.toml @@ -12,9 +12,5 @@ categories.workspace = true [dependencies] serde = { workspace = true, features = ["derive"] } -tracing.workspace = true async-trait.workspace = true anyhow.workspace = true - -zksync_config.workspace = true -zksync_types.workspace = true diff --git a/core/lib/db_connection/Cargo.toml b/core/lib/db_connection/Cargo.toml index fa5bb0b20af..fb535d58232 100644 --- a/core/lib/db_connection/Cargo.toml +++ b/core/lib/db_connection/Cargo.toml @@ -12,7 +12,6 @@ categories.workspace = true [dependencies] zksync_basic_types.workspace = true -zksync_health_check.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true diff --git a/core/lib/tee_verifier/Cargo.toml b/core/lib/tee_verifier/Cargo.toml index a56f383bdba..6828eeef8b1 100644 --- a/core/lib/tee_verifier/Cargo.toml +++ b/core/lib/tee_verifier/Cargo.toml @@ -14,12 +14,9 @@ categories.workspace = true zksync_multivm.workspace = true zksync_config.workspace = true zksync_crypto_primitives.workspace = true -zksync_dal.workspace = true -zksync_db_connection.workspace = true zksync_merkle_tree.workspace = true zksync_object_store.workspace = true zksync_prover_interface.workspace = true -zksync_queued_job_processor.workspace = true zksync_types.workspace = true zksync_utils.workspace = true diff --git a/core/lib/utils/Cargo.toml b/core/lib/utils/Cargo.toml index 5ec27380df5..593952f16ac 100644 --- a/core/lib/utils/Cargo.toml +++ b/core/lib/utils/Cargo.toml @@ -25,7 +25,6 @@ thiserror.workspace = true futures.workspace = true hex.workspace = true reqwest = { workspace = true, features = ["blocking"] } -itertools.workspace = true serde_json.workspace = true once_cell.workspace = true diff --git a/core/lib/zksync_core_leftovers/Cargo.toml b/core/lib/zksync_core_leftovers/Cargo.toml index 4eab8823474..6aa6e6a8b43 100644 --- a/core/lib/zksync_core_leftovers/Cargo.toml +++ b/core/lib/zksync_core_leftovers/Cargo.toml @@ -11,12 +11,10 @@ keywords.workspace = true categories.workspace = true [dependencies] -zksync_dal.workspace = true zksync_config.workspace = true zksync_protobuf.workspace = true zksync_protobuf_config.workspace = true zksync_env_config.workspace = true -zksync_node_genesis.workspace = true anyhow.workspace = true tokio = { workspace = true, features = ["time"] } diff --git a/core/node/consistency_checker/Cargo.toml b/core/node/consistency_checker/Cargo.toml index 769690b493a..ed2cbd5bbd7 100644 --- a/core/node/consistency_checker/Cargo.toml +++ b/core/node/consistency_checker/Cargo.toml @@ -14,7 +14,6 @@ categories.workspace = true zksync_contracts.workspace = true zksync_dal.workspace = true zksync_eth_client.workspace = true -zksync_eth_sender.workspace = true zksync_health_check.workspace = true zksync_l1_contract_interface.workspace = true zksync_shared_metrics.workspace = true diff --git a/core/node/db_pruner/Cargo.toml b/core/node/db_pruner/Cargo.toml index eb21e3e476d..98eba1b6c0e 100644 --- a/core/node/db_pruner/Cargo.toml +++ b/core/node/db_pruner/Cargo.toml @@ -26,7 +26,6 @@ serde_json.workspace = true [dev-dependencies] assert_matches.workspace = true -test-casing.workspace = true test-log.workspace = true zksync_node_genesis.workspace = true diff --git a/core/node/fee_model/Cargo.toml b/core/node/fee_model/Cargo.toml index 09048515e7a..8760b97d9db 100644 --- a/core/node/fee_model/Cargo.toml +++ b/core/node/fee_model/Cargo.toml @@ -27,4 +27,3 @@ tracing.workspace = true [dev-dependencies] test-casing.workspace = true -zksync_node_test_utils.workspace = true diff --git a/core/node/node_framework/Cargo.toml b/core/node/node_framework/Cargo.toml index d5b19a1d4b0..2288c0ddbe8 100644 --- a/core/node/node_framework/Cargo.toml +++ b/core/node/node_framework/Cargo.toml @@ -18,7 +18,6 @@ zksync_health_check.workspace = true zksync_dal.workspace = true zksync_db_connection.workspace = true zksync_config.workspace = true -zksync_protobuf_config.workspace = true zksync_state.workspace = true zksync_object_store.workspace = true zksync_storage.workspace = true @@ -67,7 +66,6 @@ ctrlc.workspace = true semver.workspace = true [dev-dependencies] -zksync_env_config.workspace = true assert_matches.workspace = true # For running UI tests for proc macro trybuild.workspace = true diff --git a/core/node/proof_data_handler/Cargo.toml b/core/node/proof_data_handler/Cargo.toml index 31a0e8437ba..82063b23fdb 100644 --- a/core/node/proof_data_handler/Cargo.toml +++ b/core/node/proof_data_handler/Cargo.toml @@ -16,7 +16,6 @@ zksync_config.workspace = true zksync_dal.workspace = true zksync_object_store.workspace = true zksync_prover_interface.workspace = true -zksync_tee_verifier.workspace = true zksync_types.workspace = true anyhow.workspace = true axum.workspace = true