chore(ci): move local deps to root toml (#312)

starkware-libs · Aug 6, 2024 · 9c1860b · 9c1860b
1 parent e9a9f67
commit 9c1860b
Show file tree

Hide file tree

Showing 28 changed files with 154 additions and 131 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,6 +63,7 @@ base64 = "0.13.0"
 bincode = "1.3.3"
 bisection = "0.1.0"
 bitvec = "1.0.1"
+blockifier = { path = "crates/blockifier", version = "0.8.0-rc.0" }
 byteorder = "1.4.3"
 bytes = "1"
 cached = "0.44.0"
@@ -77,6 +78,7 @@ camelpaste = "0.1.0"
 chrono = "0.4.26"
 clap = "4.3.10"
 colored = "2.1.0"
+committer = { path = "crates/committer", version = "0.1.0-rc.0" }
 const_format = "0.2.30"
 criterion = "0.3"
 deadqueue = "0.2.4"
@@ -108,6 +110,7 @@ libp2p-swarm-test = "0.3.0"
 log = "0.4"
 lru = "0.12.0"
 memmap2 = "0.8.0"
+mempool_test_utils = { path = "crates/mempool_test_utils", version = "0.0" }
 metrics = "0.21.0"
 metrics-exporter-prometheus = "0.12.1"
 mockall = "0.12.1"
@@ -118,7 +121,20 @@ num-traits = "0.2.15"
 once_cell = "1.19.0"
 os_info = "3.6.0"
 page_size = "0.6.0"
+papyrus_base_layer = { path = "crates/papyrus_base_layer", version = "0.4.0-rc.0" }
+papyrus_common = { path = "crates/papyrus_common", version = "0.4.0-rc.0" }
 papyrus_config = { path = "crates/papyrus_config", version = "0.4.0-rc.0" }
+papyrus_consensus = { path = "crates/sequencing/papyrus_consensus", version = "0.4.0-rc.0" }
+papyrus_execution = { path = "crates/papyrus_execution", version = "0.4.0-rc.0" }
+papyrus_monitoring_gateway = { path = "crates/papyrus_monitoring_gateway", version = "0.4.0-rc.0" }
+papyrus_network = { path = "crates/papyrus_network", version = "0.4.0-rc.0" }
+papyrus_p2p_sync = { path = "crates/papyrus_p2p_sync", version = "0.4.0-rc.0" }
+papyrus_proc_macros = { path = "crates/papyrus_proc_macros", version = "0.4.0-rc.0" }
+papyrus_protobuf = { path = "crates/papyrus_protobuf", 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" }
+papyrus_sync = { path = "crates/papyrus_sync", version = "0.4.0-rc.0" }
+papyrus_test_utils = { path = "crates/papyrus_test_utils", version = "0.4.0-rc.0" }
 parity-scale-codec = "=3.6.9"
 parity-scale-codec-derive = "=3.6.9"
 paste = "1.0.15"
@@ -151,6 +167,15 @@ simplelog = "0.12.2"
 starknet-core = "0.6.0"
 starknet-crypto = "0.5.1"
 starknet-types-core = { version = "0.1.5", features = ["hash", "prime-bigint", "std"] }
+starknet_api = { path = "crates/starknet_api", version = "0.13.0-rc.0" }
+starknet_client = { path = "crates/starknet_client", version = "0.4.0-rc.0" }
+starknet_gateway = { path = "crates/gateway", version = "0.0" }
+starknet_mempool = { path = "crates/mempool", version = "0.0" }
+starknet_mempool_infra = { path = "crates/mempool_infra", version = "0.0" }
+starknet_mempool_node = { path = "crates/mempool_node", version = "0.0" }
+starknet_mempool_types = { path = "crates/mempool_types", version = "0.0" }
+starknet_sierra_compile = { path = "crates/starknet_sierra_compile", version = "0.0" }
+starknet_task_executor = { path = "crates/task_executor", version = "0.0" }
 static_assertions = "1.1.0"
 statistical = "1.0.0"
 strum = "0.25.0"

diff --git a/crates/blockifier/Cargo.toml b/crates/blockifier/Cargo.toml
@@ -47,7 +47,7 @@ serde_json = { workspace = true, features = ["arbitrary_precision"] }
 sha2.workspace = true
 sha3.workspace = true
 starknet-types-core.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] }
+starknet_api = { workspace = true, features = ["testing"] }
 strum.workspace = true
 strum_macros.workspace = true
 thiserror.workspace = true

diff --git a/crates/committer_cli/Cargo.toml b/crates/committer_cli/Cargo.toml
@@ -17,7 +17,7 @@ tempfile.workspace = true
 
 [dependencies]
 clap = { version = "4.5.4", features = ["cargo", "derive"] }
-committer = { path = "../committer", features = ["testing"] }
+committer = { workspace = true, features = ["testing"] }
 derive_more.workspace = true
 ethnum.workspace = true
 indexmap.workspace = true
@@ -29,7 +29,7 @@ serde_json = "1.0.116"
 serde_repr = "0.1.19"
 simplelog.workspace = true
 starknet-types-core.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
+starknet_api.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
 thiserror.workspace = true

diff --git a/crates/gateway/Cargo.toml b/crates/gateway/Cargo.toml
@@ -14,22 +14,22 @@ testing = []
 [dependencies]
 async-trait.workspace = true
 axum.workspace = true
-blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["testing"] }
+blockifier = { workspace = true, features = ["testing"] }
 cairo-lang-starknet-classes.workspace = true
 cairo-vm.workspace = true
 hyper.workspace = true
-mempool_test_utils = { path = "../mempool_test_utils", version = "0.0" }
+mempool_test_utils.workspace = true
 num-traits.workspace = true
 papyrus_config.workspace = true
-papyrus_rpc = { path = "../papyrus_rpc", version = "0.4.0-rc.0" }
+papyrus_rpc.workspace = true
 reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 starknet-types-core.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
-starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" }
-starknet_mempool_types = { path = "../mempool_types", version = "0.0" }
-starknet_sierra_compile = { path = "../starknet_sierra_compile", version = "0.0" }
+starknet_api.workspace = true
+starknet_mempool_infra.workspace = true
+starknet_mempool_types.workspace = true
+starknet_sierra_compile.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
 tracing.workspace = true
@@ -42,4 +42,4 @@ mockito = "1.4.0"
 num-bigint.workspace = true
 pretty_assertions.workspace = true
 rstest.workspace = true
-starknet_mempool = { path = "../mempool", version = "0.0" }
+starknet_mempool.workspace = true
diff --git a/crates/mempool/Cargo.toml b/crates/mempool/Cargo.toml
@@ -11,9 +11,9 @@ workspace = true
 [dependencies]
 async-trait.workspace = true
 derive_more.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
-starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" }
-starknet_mempool_types = { path = "../mempool_types", version = "0.0" }
+starknet_api.workspace = true
+starknet_mempool_infra.workspace = true
+starknet_mempool_types.workspace = true
 tokio.workspace = true
 
 [dev-dependencies]
@@ -22,5 +22,5 @@ itertools.workspace = true
 pretty_assertions.workspace = true
 rstest.workspace = true
 starknet-types-core.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] }
+starknet_api = { workspace = true, features = ["testing"] }
 tokio.workspace = true
diff --git a/crates/mempool_node/Cargo.toml b/crates/mempool_node/Cargo.toml
@@ -15,10 +15,10 @@ const_format.workspace = true
 futures.workspace = true
 papyrus_config.workspace = true
 serde.workspace = true
-starknet_gateway = { path = "../gateway", version = "0.0" }
-starknet_mempool = { path = "../mempool", version = "0.0" }
-starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" }
-starknet_mempool_types = { path = "../mempool_types", version = "0.0" }
+starknet_gateway.workspace = true
+starknet_mempool.workspace = true
+starknet_mempool_infra.workspace = true
+starknet_mempool_types.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 validator.workspace = true
@@ -27,6 +27,6 @@ validator.workspace = true
 assert-json-diff.workspace = true
 assert_matches.workspace = true
 colored.workspace = true
-mempool_test_utils = { path = "../mempool_test_utils" }
+mempool_test_utils.workspace = true
 pretty_assertions.workspace = true
 serde_json.workspace = true
diff --git a/crates/mempool_test_utils/Cargo.toml b/crates/mempool_test_utils/Cargo.toml
@@ -9,7 +9,7 @@ license.workspace = true
 
 [dependencies]
 assert_matches.workspace = true
-blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["testing"] }
+blockifier = { workspace = true, features = ["testing"] }
 serde_json.workspace = true
 starknet-types-core.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
+starknet_api.workspace = true
diff --git a/crates/mempool_types/Cargo.toml b/crates/mempool_types/Cargo.toml
@@ -11,6 +11,6 @@ workspace = true
 [dependencies]
 async-trait.workspace = true
 mockall.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
-starknet_mempool_infra = { path = "../mempool_infra" }
+starknet_api.workspace = true
+starknet_mempool_infra.workspace = true
 thiserror.workspace = true
diff --git a/crates/native_blockifier/Cargo.toml b/crates/native_blockifier/Cargo.toml
@@ -27,19 +27,19 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # TODO(Dori, 1/1/2025): Add the "jemalloc" feature to the blockifier crate when possible.
-blockifier = { path = "../blockifier", features = ["concurrency", "testing"] }
+blockifier = { workspace = true, features = ["concurrency", "testing"] }
 cairo-lang-starknet-classes.workspace = true
 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"] }
 serde_json = { workspace = true, features = ["arbitrary_precision"] }
 starknet-types-core.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] }
+starknet_api = { workspace = true, features = ["testing"] }
 thiserror.workspace = true
 
 [dev-dependencies]

diff --git a/crates/papyrus_base_layer/Cargo.toml b/crates/papyrus_base_layer/Cargo.toml
@@ -12,7 +12,7 @@ papyrus_config.workspace = true
 rustc-hex.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
+starknet_api.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full", "sync"] }
 url.workspace = true
@@ -21,7 +21,7 @@ url.workspace = true
 ethers-core = { version = "2.0.3" }
 pretty_assertions.workspace = true
 starknet-types-core.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] }
+starknet_api = { workspace = true, features = ["testing"] }
 tar = { version = "0.4.38" }
 tempfile.workspace = true
 test-with = { version = "0.9.3", default-features = false, features = ["executable"] }
diff --git a/crates/papyrus_common/Cargo.toml b/crates/papyrus_common/Cargo.toml
@@ -17,11 +17,11 @@ serde.workspace = true
 serde_json.workspace = true
 sha3.workspace = true
 starknet-types-core = { workspace = true, features = ["hash"] }
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
+starknet_api.workspace = true
 thiserror.workspace = true
 
 [dev-dependencies]
 assert_matches.workspace = true
-papyrus_test_utils = { path = "../papyrus_test_utils" }
+papyrus_test_utils.workspace = true
 pretty_assertions.workspace = true
 serde_json = { workspace = true, features = ["arbitrary_precision"] }
diff --git a/crates/papyrus_config/Cargo.toml b/crates/papyrus_config/Cargo.toml
@@ -22,5 +22,5 @@ validator = { workspace = true, features = ["derive"] }
 assert_matches.workspace = true
 itertools.workspace = true
 lazy_static.workspace = true
-papyrus_test_utils = { path = "../papyrus_test_utils" }
+papyrus_test_utils.workspace = true
 tempfile.workspace = true
diff --git a/crates/papyrus_execution/Cargo.toml b/crates/papyrus_execution/Cargo.toml
@@ -11,23 +11,23 @@ testing = ["papyrus_test_utils", "rand", "rand_chacha"]
 
 [dependencies]
 anyhow.workspace = true
-blockifier = { path = "../blockifier", version = "0.8.0-rc.0" }
+blockifier.workspace = true
 cairo-lang-starknet-classes.workspace = true
 cairo-vm.workspace = true
 indexmap.workspace = true
 itertools.workspace = true
 lazy_static.workspace = true
 once_cell.workspace = true
-papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" }
+papyrus_common.workspace = true
 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"] }
 serde_json = { workspace = true, features = ["arbitrary_precision"] }
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
+starknet_api.workspace = true
 starknet-types-core.workspace = true
-papyrus_test_utils = { path = "../papyrus_test_utils", optional = true }
+papyrus_test_utils = { workspace = true, optional = true }
 thiserror.workspace = true
 tracing.workspace = true
 
@@ -36,11 +36,11 @@ 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
-papyrus_test_utils = { path = "../papyrus_test_utils" }
+papyrus_test_utils.workspace = true
 
 [package.metadata.cargo-machete]
 # The `rand` crate is used in the `testing` feature, which is optional.

diff --git a/crates/papyrus_monitoring_gateway/Cargo.toml b/crates/papyrus_monitoring_gateway/Cargo.toml
@@ -11,11 +11,11 @@ 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"] }
-starknet_client = { path = "../starknet_client" }
+starknet_client.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full", "sync"] }
 tracing.workspace = true
@@ -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"] }
+starknet_client = { workspace = true, features = ["testing"] }
 tower = { workspace = true, features = ["util"] }
diff --git a/crates/papyrus_network/Cargo.toml b/crates/papyrus_network/Cargo.toml
@@ -33,7 +33,7 @@ libp2p = { workspace = true, features = [
   "yamux",
 ] }
 metrics.workspace = true
-papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" }
+papyrus_common.workspace = true
 papyrus_config.workspace = true
 replace_with.workspace = true
 serde = { workspace = true, features = ["derive"] }

diff --git a/crates/papyrus_node/Cargo.toml b/crates/papyrus_node/Cargo.toml
@@ -25,22 +25,22 @@ futures.workspace = true
 itertools.workspace = true
 lazy_static.workspace = true
 once_cell.workspace = true
-papyrus_base_layer = { path = "../papyrus_base_layer", version = "0.4.0-rc.0" }
-papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" }
+papyrus_base_layer.workspace = true
+papyrus_common.workspace = true
 papyrus_config.workspace = true
-papyrus_consensus = { path = "../sequencing/papyrus_consensus", version = "0.4.0-rc.0" }
-papyrus_monitoring_gateway = { path = "../papyrus_monitoring_gateway", version = "0.4.0-rc.0" }
-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 = { path = "../papyrus_rpc", version = "0.4.0-rc.0", optional = true }
-papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" }
-papyrus_sync = { path = "../papyrus_sync", version = "0.4.0-rc.0" }
+papyrus_consensus.workspace = true
+papyrus_monitoring_gateway.workspace = true
+papyrus_network.workspace = true
+papyrus_p2p_sync.workspace = true
+papyrus_protobuf.workspace = true
+papyrus_rpc = { workspace = true, optional = true }
+papyrus_storage.workspace = true
+papyrus_sync.workspace = true
 reqwest = { workspace = true, features = ["blocking", "json"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["arbitrary_precision"] }
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] }
-starknet_client = { path = "../starknet_client" }
+starknet_api = { workspace = true, features = ["testing"] }
+starknet_client.workspace = true
 strum.workspace = true
 tokio = { workspace = true, features = ["full", "sync"] }
 tracing.workspace = true
@@ -57,6 +57,6 @@ assert-json-diff.workspace = true
 colored.workspace = true
 insta = { workspace = true, features = ["json"] }
 metrics-exporter-prometheus.workspace = true
-papyrus_test_utils = { path = "../papyrus_test_utils" }
+papyrus_test_utils.workspace = true
 pretty_assertions.workspace = true
 tempfile.workspace = true