From ccc81d5d725821d5f37325f7a52257bd04d7c831 Mon Sep 17 00:00:00 2001 From: Dori Medini Date: Thu, 1 Aug 2024 14:32:00 +0300 Subject: [PATCH] chore(ci): move papyrus_storage dep to root toml --- Cargo.toml | 1 + crates/native_blockifier/Cargo.toml | 2 +- crates/papyrus_execution/Cargo.toml | 4 ++-- crates/papyrus_monitoring_gateway/Cargo.toml | 4 ++-- crates/papyrus_node/Cargo.toml | 2 +- crates/papyrus_p2p_sync/Cargo.toml | 4 ++-- crates/papyrus_rpc/Cargo.toml | 4 ++-- crates/papyrus_sync/Cargo.toml | 4 ++-- crates/sequencing/papyrus_block_builder/Cargo.toml | 2 +- crates/sequencing/papyrus_consensus/Cargo.toml | 4 ++-- crates/tests-integration/Cargo.toml | 2 +- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9c0a6b83da..5d18e755da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -125,6 +125,7 @@ papyrus_base_layer = { path = "crates/papyrus_base_layer", version = "0.4.0-rc.0 papyrus_config = { path = "crates/papyrus_config", version = "0.4.0-rc.0" } papyrus_proc_macros = { path = "crates/papyrus_proc_macros", version = "0.4.0-rc.0" } papyrus_rpc = { path = "crates/papyrus_rpc", version = "0.4.0-rc.0" } +papyrus_storage = { path = "crates/papyrus_storage", version = "0.4.0-rc.0" } parity-scale-codec = "=3.6.9" parity-scale-codec-derive = "=3.6.9" paste = "1.0.15" diff --git a/crates/native_blockifier/Cargo.toml b/crates/native_blockifier/Cargo.toml index 6627f2a3d1..37d59a8106 100644 --- a/crates/native_blockifier/Cargo.toml +++ b/crates/native_blockifier/Cargo.toml @@ -33,7 +33,7 @@ cairo-vm.workspace = true indexmap.workspace = true log.workspace = true num-bigint.workspace = true -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } pyo3 = { workspace = true, features = ["hashbrown", "num-bigint"] } pyo3-log.workspace = true serde = { workspace = true, features = ["derive"] } diff --git a/crates/papyrus_execution/Cargo.toml b/crates/papyrus_execution/Cargo.toml index fb64362032..171e32d063 100644 --- a/crates/papyrus_execution/Cargo.toml +++ b/crates/papyrus_execution/Cargo.toml @@ -20,7 +20,7 @@ lazy_static.workspace = true once_cell.workspace = true papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } papyrus_config.workspace = true -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_storage.workspace = true rand = { workspace = true, optional = true } rand_chacha = { workspace = true, optional = true } serde = { workspace = true, features = ["derive"] } @@ -36,7 +36,7 @@ assert_matches.workspace = true cairo-lang-casm.workspace = true cairo-lang-utils.workspace = true indexmap = { workspace = true, features = ["serde"] } -papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } pretty_assertions.workspace = true rand.workspace = true rand_chacha.workspace = true diff --git a/crates/papyrus_monitoring_gateway/Cargo.toml b/crates/papyrus_monitoring_gateway/Cargo.toml index 3b8e209c6d..dc39e7154a 100644 --- a/crates/papyrus_monitoring_gateway/Cargo.toml +++ b/crates/papyrus_monitoring_gateway/Cargo.toml @@ -11,7 +11,7 @@ hyper = { workspace = true, features = ["full"] } metrics-exporter-prometheus = { version = "0.12.1" } metrics-process = { version = "1.0.11" } papyrus_config.workspace = true -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_storage.workspace = true rand.workspace = true serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision"] } @@ -24,7 +24,7 @@ validator = { workspace = true, features = ["derive"] } [dev-dependencies] http-body = { version = "0.4.5" } metrics.workspace = true -papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } pretty_assertions.workspace = true starknet_client = { path = "../starknet_client", features = ["testing"] } tower = { workspace = true, features = ["util"] } diff --git a/crates/papyrus_node/Cargo.toml b/crates/papyrus_node/Cargo.toml index 5a59c2667f..0b9455d00e 100644 --- a/crates/papyrus_node/Cargo.toml +++ b/crates/papyrus_node/Cargo.toml @@ -34,7 +34,7 @@ papyrus_network = { path = "../papyrus_network", version = "0.4.0-rc.0" } papyrus_p2p_sync = { path = "../papyrus_p2p_sync", version = "0.4.0-rc.0" } papyrus_protobuf = { path = "../papyrus_protobuf", version = "0.4.0-rc.0" } papyrus_rpc = { workspace = true, optional = true } -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_storage.workspace = true papyrus_sync = { path = "../papyrus_sync", version = "0.4.0-rc.0" } reqwest = { workspace = true, features = ["blocking", "json"] } serde = { workspace = true, features = ["derive"] } diff --git a/crates/papyrus_p2p_sync/Cargo.toml b/crates/papyrus_p2p_sync/Cargo.toml index 56b95f016d..cdb0a40b7b 100644 --- a/crates/papyrus_p2p_sync/Cargo.toml +++ b/crates/papyrus_p2p_sync/Cargo.toml @@ -17,7 +17,7 @@ papyrus_config.workspace = true papyrus_network = { path = "../papyrus_network", version = "0.4.0-rc.0" } papyrus_proc_macros.workspace = true papyrus_protobuf = { path = "../papyrus_protobuf", version = "0.4.0-rc.0" } -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_storage.workspace = true serde.workspace = true starknet_api.workspace = true starknet-types-core.workspace = true @@ -29,7 +29,7 @@ tracing.workspace = true [dev-dependencies] assert_matches.workspace = true lazy_static.workspace = true -papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } static_assertions.workspace = true rand.workspace = true rand_chacha.workspace = true diff --git a/crates/papyrus_rpc/Cargo.toml b/crates/papyrus_rpc/Cargo.toml index 7de6d3ddf7..f6143b1927 100644 --- a/crates/papyrus_rpc/Cargo.toml +++ b/crates/papyrus_rpc/Cargo.toml @@ -22,7 +22,7 @@ papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } papyrus_config.workspace = true papyrus_execution = { path = "../papyrus_execution", version = "0.4.0-rc.0" } papyrus_proc_macros.workspace = true -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_storage.workspace = true regex = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision"] } @@ -49,7 +49,7 @@ lazy_static.workspace = true metrics-exporter-prometheus.workspace = true mockall.workspace = true papyrus_execution = { path = "../papyrus_execution", features = ["testing"] } -papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } papyrus_test_utils = { path = "../papyrus_test_utils" } pretty_assertions.workspace = true prometheus-parse.workspace = true diff --git a/crates/papyrus_sync/Cargo.toml b/crates/papyrus_sync/Cargo.toml index 19977f3346..709fd5cac2 100644 --- a/crates/papyrus_sync/Cargo.toml +++ b/crates/papyrus_sync/Cargo.toml @@ -20,7 +20,7 @@ papyrus_base_layer.workspace = true papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } papyrus_config.workspace = true papyrus_proc_macros.workspace = true -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_storage.workspace = true reqwest = { workspace = true, features = ["blocking", "json"] } serde = { workspace = true, features = ["derive"] } starknet-types-core.workspace = true @@ -33,7 +33,7 @@ tracing.workspace = true [dev-dependencies] assert_matches.workspace = true mockall.workspace = true -papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } papyrus_test_utils = { path = "../papyrus_test_utils" } pretty_assertions.workspace = true simple_logger.workspace = true diff --git a/crates/sequencing/papyrus_block_builder/Cargo.toml b/crates/sequencing/papyrus_block_builder/Cargo.toml index 55dda4bf68..d270dd0e8b 100644 --- a/crates/sequencing/papyrus_block_builder/Cargo.toml +++ b/crates/sequencing/papyrus_block_builder/Cargo.toml @@ -7,7 +7,7 @@ license-file.workspace = true description = "A block-builder for Starknet blocks" [dependencies] -papyrus_storage = { path = "../../papyrus_storage", version = "0.4.0-rc.0", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } starknet_api.workspace = true thiserror.workspace = true tracing.workspace = true diff --git a/crates/sequencing/papyrus_consensus/Cargo.toml b/crates/sequencing/papyrus_consensus/Cargo.toml index bd178c24e8..4fe5ceaf4b 100644 --- a/crates/sequencing/papyrus_consensus/Cargo.toml +++ b/crates/sequencing/papyrus_consensus/Cargo.toml @@ -14,7 +14,7 @@ papyrus_common = { path = "../../papyrus_common", version = "0.4.0-dev.2" } papyrus_config.workspace = true papyrus_network = { path = "../../papyrus_network", version = "0.4.0-dev.2" } papyrus_protobuf = { path = "../../papyrus_protobuf", version = "0.4.0-dev.2" } -papyrus_storage = { path = "../../papyrus_storage", version = "0.4.0-dev.2" } +papyrus_storage.workspace = true serde = { workspace = true, features = ["derive"] } starknet-types-core.workspace = true starknet_api.workspace = true @@ -27,6 +27,6 @@ mockall.workspace = true papyrus_network = { path = "../../papyrus_network", version = "0.4.0-dev.2", features = [ "testing", ] } -papyrus_storage = { path = "../../papyrus_storage", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } papyrus_test_utils = { path = "../../papyrus_test_utils" } test-case.workspace = true diff --git a/crates/tests-integration/Cargo.toml b/crates/tests-integration/Cargo.toml index 5b7f2ea0af..2f286eb039 100644 --- a/crates/tests-integration/Cargo.toml +++ b/crates/tests-integration/Cargo.toml @@ -17,7 +17,7 @@ itertools.workspace = true mempool_test_utils.workspace = true papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } papyrus_rpc.workspace = true -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_storage.workspace = true reqwest.workspace = true serde_json.workspace = true starknet-types-core.workspace = true