From dc0c01277028714ad21be954ae47bc2c85627ced Mon Sep 17 00:00:00 2001 From: Cifko Date: Fri, 15 Dec 2023 14:41:53 +0100 Subject: [PATCH] use workspace --- Cargo.toml | 11 ++++++----- dan_layer/common_types/Cargo.toml | 2 +- dan_layer/engine_types/Cargo.toml | 2 +- dan_layer/wallet/sdk/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 804ffe297b..eb5090824a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,8 +58,8 @@ resolver = "2" # specifying them in a single place and having them applied to all crates # internal dependencies among workspace crates -libp2p-messaging = { path = "networking/libp2p-messaging"} -libp2p-peersync = { path = "networking/libp2p-peersync"} +libp2p-messaging = { path = "networking/libp2p-messaging" } +libp2p-peersync = { path = "networking/libp2p-peersync" } libp2p-substream = { path = "networking/libp2p-substream" } proto_builder = { path = "networking/proto_builder" } sqlite_message_logger = { path = "networking/sqlite_message_logger" } @@ -87,10 +87,10 @@ tari_rpc_framework = { path = "networking/rpc_framework" } tari_rpc_macros = { path = "networking/rpc_macros" } tari_state_store_sqlite = { path = "dan_layer/state_store_sqlite" } tari_swarm = { path = "networking/swarm" } -tari_template_abi = { version="0.3.0", path = "dan_layer/template_abi" } +tari_template_abi = { version = "0.3.0", path = "dan_layer/template_abi" } tari_template_builtin = { path = "dan_layer/template_builtin" } tari_template_lib = { path = "dan_layer/template_lib" } -tari_template_macros = { version="0.3.0", path = "dan_layer/template_macros" } +tari_template_macros = { version = "0.3.0", path = "dan_layer/template_macros" } tari_template_test_tooling = { path = "dan_layer/template_test_tooling" } tari_transaction = { path = "dan_layer/transaction" } tari_transaction_manifest = { path = "dan_layer/transaction_manifest" } @@ -117,6 +117,7 @@ tari_comms_rpc_macros = { git = "https://github.com/tari-project/tari.git", bran # avoid including default features so each crate can choose which ones to import tari_core = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2", default-features = false } tari_crypto = "0.19" +tari_hash_domains = { git = "https://github.com/tari-project/tari_hash_domains.git" } tari_key_manager = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" } tari_metrics = { git = "https://github.com/tari-project/tari.git" } tari_mmr = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" } @@ -212,7 +213,7 @@ tokio-stream = "0.1.7" tokio-util = "0.7.10" tonic = "0.6.2" tower = "0.4" -tower-http = { version = "0.3.5", default-features = false} +tower-http = { version = "0.3.5", default-features = false } tower-layer = "0.3" tracing = "0.1.40" url = "2.4.1" diff --git a/dan_layer/common_types/Cargo.toml b/dan_layer/common_types/Cargo.toml index 91b5b5a45b..586ba4d38b 100644 --- a/dan_layer/common_types/Cargo.toml +++ b/dan_layer/common_types/Cargo.toml @@ -15,7 +15,7 @@ tari_mmr = { workspace = true } tari_core = { workspace = true, default-features = false, features = [ "transactions", ] } -tari_hash_domains = { git = "https://github.com/tari-project/tari_hash_domains.git" } +tari_hash_domains = { workspace = true } libp2p-identity = { workspace = true, features = [ "sr25519", diff --git a/dan_layer/engine_types/Cargo.toml b/dan_layer/engine_types/Cargo.toml index 1e79e81a07..b82a1a9f51 100644 --- a/dan_layer/engine_types/Cargo.toml +++ b/dan_layer/engine_types/Cargo.toml @@ -14,7 +14,7 @@ tari_crypto = { workspace = true, features = ["borsh"] } tari_template_abi = { workspace = true, features = ["std"] } tari_template_lib = { workspace = true } tari_utilities = { workspace = true } -tari_hash_domains = { git = "https://github.com/tari-project/tari_hash_domains.git" } +tari_hash_domains = { workspace = true } borsh = { workspace = true } # if we set this version in the workspace it would break other crates diff --git a/dan_layer/wallet/sdk/Cargo.toml b/dan_layer/wallet/sdk/Cargo.toml index 722d89f563..c79353ce69 100644 --- a/dan_layer/wallet/sdk/Cargo.toml +++ b/dan_layer/wallet/sdk/Cargo.toml @@ -18,7 +18,7 @@ tari_key_manager = { workspace = true } tari_transaction = { workspace = true } tari_template_lib = { workspace = true } tari_utilities = { workspace = true } -tari_hash_domains = { git = "https://github.com/tari-project/tari_hash_domains.git" } +tari_hash_domains = { workspace = true } anyhow = { workspace = true } async-trait = { workspace = true }