Skip to content

Commit 99ec71d

Browse files
stringhandlerstringhandler
authored
refactor: move to workspace dependencies (#6832)
First of many PRs to get alignment with `feature-dan2` branch <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Chores** - Standardized project metadata and dependency management across modules. - Streamlined workspace integration to ensure consistency and improve long-term maintainability. - Updated package metadata to reference workspace configuration for better organization. - Enhanced dependency management by transitioning to workspace settings for multiple packages. - Added new dependency `cargo_toml = { version = "0.20.4" }` for improved manifest handling. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent 7d323a3 commit 99ec71d

File tree

35 files changed

+454
-421
lines changed

35 files changed

+454
-421
lines changed

‎Cargo.lock

Lines changed: 12 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
[workspace]
1+
[workspace.package]
2+
version = "1.11.6-pre.0"
3+
edition = "2021"
4+
authors = ["The Tari Development Community"]
5+
repository = "https://github.com/tari-project/tari"
6+
license = "BSD-3-Clause"
27

8+
[workspace]
39
members = [
410
"base_layer/chat_ffi",
511
"base_layer/core",
@@ -18,6 +24,7 @@ members = [
1824
"comms/dht",
1925
"comms/rpc_macros",
2026
"common_sqlite",
27+
"common/tari_features",
2128
"infrastructure/libtor",
2229
"infrastructure/metrics",
2330
"infrastructure/shutdown",
@@ -33,16 +40,57 @@ members = [
3340
"applications/minotari_ledger_wallet/comms",
3441
"applications/minotari_ledger_wallet/common",
3542
"integration_tests",
36-
"hashing"
43+
"hashing",
3744
]
38-
3945
# Add here until we move to edition=2021
4046
resolver = "2"
4147

48+
49+
[workspace.dependencies]
50+
# tari_jellyfish = { path = "infrastructure/jellyfish" }
51+
tari_chat_client = { path = "base_layer/contacts/src/chat_client" }
52+
tari_common = { path = "common" }
53+
tari_common_sqlite = { path = "common_sqlite" }
54+
tari_common_types = { path = "base_layer/common_types" }
55+
tari_comms = { path = "comms/core" }
56+
tari_comms_dht = { path = "comms/dht", default-features = false }
57+
tari_comms_rpc_macros = { path = "comms/rpc_macros" }
58+
tari_contacts = { path = "base_layer/contacts" }
59+
tari_core = { path = "base_layer/core", default-features = false }
60+
tari_crypto = { version = "0.22.0" }
61+
tari_features = { path = "common/tari_features" }
62+
tari_hashing = { path = "hashing" }
63+
tari_key_manager = { path = "base_layer/key_manager" }
64+
tari_libtor = { path = "infrastructure/libtor" }
65+
tari_metrics = { path = "infrastructure/metrics" }
66+
tari_mmr = { path = "base_layer/mmr" }
67+
tari_max_size = { path = "infrastructure/max_size" }
68+
tari_p2p = { path = "base_layer/p2p" }
69+
tari_script = { path = "infrastructure/tari_script" }
70+
tari_service_framework = { path = "base_layer/service_framework" }
71+
tari_shutdown = { path = "infrastructure/shutdown" }
72+
tari_storage = { path = "infrastructure/storage" }
73+
tari_test_utils = { path = "infrastructure/test_utils" }
74+
tari_utilities = { version = "0.8" }
75+
minotari_app_grpc = { path = "applications/minotari_app_grpc" }
76+
minotari_app_utilities = { path = "applications/minotari_app_utilities" }
77+
minotari_wallet = { path = "base_layer/wallet" }
78+
minotari_node_grpc_client = { path = "clients/rust/base_node_grpc_client" }
79+
minotari_chat_ffi = { path = "base_layer/chat_ffi" }
80+
minotari_console_wallet = { path = "applications/minotari_console_wallet" }
81+
minotari_merge_mining_proxy = { path = "applications/minotari_merge_mining_proxy" }
82+
minotari_miner = { path = "applications/minotari_miner" }
83+
minotari_node = { path = "applications/minotari_node" }
84+
minotari_wallet_ffi = { path = "base_layer/wallet_ffi" }
85+
minotari_wallet_grpc_client = { path = "clients/rust/wallet_grpc_client" }
86+
minotari_ledger_wallet_comms = { path = "applications/minotari_ledger_wallet/comms" }
87+
minotari_ledger_wallet_common = { path = "applications/minotari_ledger_wallet/common" }
88+
4289
[profile.release]
4390
# By default, Rust will wrap an integer in release mode instead of throwing the overflow error
4491
# seen in debug mode. Panicking at this time is better than silently using the wrong value.
4592
overflow-checks = true
4693

94+
4795
[patch.crates-io]
4896
liblmdb-sys = { git = "https://github.com/tari-project/lmdb-rs", tag = "0.7.6-tari.1" }

‎applications/minotari_app_grpc/Cargo.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[package]
22
name = "minotari_app_grpc"
3-
authors = ["The Tari Development Community"]
43
description = "This crate is to provide a single source for all cross application grpc files and conversions to and from tari::core"
5-
repository = "https://github.com/tari-project/tari"
6-
license = "BSD-3-Clause"
7-
version = "1.11.6-pre.0"
8-
edition = "2021"
4+
version.workspace = true
5+
edition.workspace = true
6+
authors.workspace = true
7+
repository.workspace = true
8+
license.workspace = true
99

1010
[dependencies]
11-
tari_common_types = { path = "../../base_layer/common_types" }
12-
tari_comms = { path = "../../comms/core" }
13-
tari_core = { path = "../../base_layer/core" }
14-
tari_crypto = { version = "0.22.0" }
15-
tari_script = { path = "../../infrastructure/tari_script" }
16-
tari_max_size = { path = "../../infrastructure/max_size" }
17-
tari_utilities = { version = "0.8" }
11+
tari_common_types = { workspace = true }
12+
tari_comms = { workspace = true }
13+
tari_core = { workspace = true }
14+
tari_crypto = { workspace = true }
15+
tari_script = { workspace = true }
16+
tari_max_size = { workspace = true }
17+
tari_utilities = { workspace = true }
1818

1919
argon2 = { version = "0.4.1", features = ["std", "password-hash"] }
2020
base64 = "0.13.0"
@@ -32,7 +32,7 @@ tonic = { version = "0.12.3", features = ["tls"] }
3232
zeroize = "1"
3333

3434
[build-dependencies]
35-
tari_features = { path = "../../common/tari_features", version = "1.11.6-pre.0" }
35+
tari_features = { workspace = true }
3636
tonic-build = "0.12.3"
3737

3838
[package.metadata.cargo-machete]

‎applications/minotari_app_utilities/Cargo.toml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
[package]
22
name = "minotari_app_utilities"
3-
version = "1.11.6-pre.0"
4-
authors = ["The Tari Development Community"]
5-
edition = "2018"
6-
license = "BSD-3-Clause"
3+
version.workspace = true
4+
edition.workspace = true
5+
authors.workspace = true
6+
repository.workspace = true
7+
license.workspace = true
78

89
[dependencies]
9-
tari_common = { path = "../../common" }
10-
tari_common_types = { path = "../../base_layer/common_types" }
11-
tari_comms = { path = "../../comms/core" }
12-
tari_utilities = { version = "0.8" }
13-
minotari_app_grpc = { path = "../minotari_app_grpc", optional = true }
10+
tari_common = { workspace = true }
11+
tari_common_types = { workspace = true }
12+
tari_comms = { workspace = true }
13+
tari_utilities = { workspace = true }
14+
minotari_app_grpc = { workspace = true, optional = true }
1415

1516
clap = { version = "3.2", features = ["derive", "env"] }
1617
futures = { version = "^0.3.16", default-features = false, features = [
@@ -26,11 +27,11 @@ dialoguer = { version = "0.10" }
2627
tonic = "0.12.3"
2728

2829
[build-dependencies]
29-
tari_common = { path = "../../common", features = [
30+
tari_common = { workspace = true, features = [
3031
"build",
3132
"static-application-info",
3233
] }
33-
tari_features = { path = "../../common/tari_features", version = "1.11.6-pre.0" }
34+
tari_features = { workspace = true }
3435

3536
[features]
3637
miner_input = ["minotari_app_grpc"]

‎applications/minotari_console_wallet/Cargo.toml

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
[package]
22
name = "minotari_console_wallet"
3-
version = "1.11.6-pre.0"
4-
authors = ["The Tari Development Community"]
5-
edition = "2018"
6-
license = "BSD-3-Clause"
3+
version.workspace = true
4+
edition.workspace = true
5+
authors.workspace = true
6+
repository.workspace = true
7+
license.workspace = true
78

89
[dependencies]
9-
minotari_app_grpc = { path = "../minotari_app_grpc" }
10-
minotari_app_utilities = { path = "../minotari_app_utilities" }
11-
minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.11.6-pre.0", optional = true }
12-
tari_common = { path = "../../common" }
13-
tari_common_types = { path = "../../base_layer/common_types" }
14-
tari_comms = { path = "../../comms/core" }
15-
tari_comms_dht = { path = "../../comms/dht" }
16-
tari_contacts = { path = "../../base_layer/contacts" }
17-
tari_crypto = { version = "0.22.0" }
18-
tari_key_manager = { path = "../../base_layer/key_manager" }
19-
tari_libtor = { path = "../../infrastructure/libtor", optional = true }
20-
tari_max_size = { path = "../../infrastructure/max_size" }
21-
tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
22-
tari_script = { path = "../../infrastructure/tari_script" }
23-
tari_shutdown = { path = "../../infrastructure/shutdown" }
24-
tari_utilities = { version = "0.8" }
25-
minotari_wallet = { path = "../../base_layer/wallet", features = [
26-
"bundled_sqlite",
27-
] }
28-
tari_hashing = { path = "../../hashing" }
10+
minotari_app_grpc = { workspace = true }
11+
minotari_app_utilities = { workspace = true }
12+
minotari_ledger_wallet_comms = { workspace = true, optional = true }
13+
tari_common = { workspace = true }
14+
tari_common_types = { workspace = true }
15+
tari_comms = { workspace = true }
16+
tari_comms_dht = { workspace = true }
17+
tari_contacts = { workspace = true }
18+
tari_crypto = { workspace = true }
19+
tari_key_manager = { workspace = true }
20+
tari_libtor = { workspace = true, optional = true }
21+
tari_max_size = { workspace = true }
22+
tari_p2p = { workspace = true, features = ["auto-update"] }
23+
tari_script = { workspace = true }
24+
tari_shutdown = { workspace = true }
25+
tari_utilities = { workspace = true }
26+
minotari_wallet = { workspace = true, features = ["bundled_sqlite"] }
27+
tari_hashing = { workspace = true }
2928

3029
# Uncomment for tokio tracing via tokio-console (needs "tracing" featurs)
3130
console-subscriber = "0.1.8"
@@ -74,7 +73,7 @@ zeroize = "1"
7473
zxcvbn = "2"
7574

7675
[dependencies.tari_core]
77-
path = "../../base_layer/core"
76+
workspace = true
7877
default-features = false
7978
features = ["transactions", "mempool_proto", "base_node_proto"]
8079

@@ -84,7 +83,7 @@ default-features = false
8483
features = ["crossterm"]
8584

8685
[build-dependencies]
87-
tari_features = { path = "../../common/tari_features", version = "1.11.6-pre.0" }
86+
tari_features = { workspace = true }
8887

8988
[features]
9089
default = ["libtor", "ledger"]

‎applications/minotari_ledger_wallet/common/Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[package]
22
name = "minotari_ledger_wallet_common"
3-
version = "1.11.6-pre.0"
4-
authors = ["The Tari Development Community"]
5-
license = "BSD-3-Clause"
6-
edition = "2021"
3+
version.workspace = true
4+
edition.workspace = true
5+
authors.workspace = true
6+
repository.workspace = true
7+
license.workspace = true
78

89
[dependencies]
910
bs58 = { version = "0.5.1", default-features = false, features = ["alloc"] }

‎applications/minotari_merge_mining_proxy/Cargo.toml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
11
[package]
22
name = "minotari_merge_mining_proxy"
3-
authors = ["The Tari Development Community"]
43
description = "The Tari merge mining proxy for xmrig"
5-
repository = "https://github.com/tari-project/tari"
6-
license = "BSD-3-Clause"
7-
version = "1.11.6-pre.0"
8-
edition = "2018"
4+
version.workspace = true
5+
edition.workspace = true
6+
authors.workspace = true
7+
repository.workspace = true
8+
license.workspace = true
99

1010
[features]
1111
default = []
1212

1313
[dependencies]
14-
minotari_app_grpc = { path = "../minotari_app_grpc" }
15-
minotari_app_utilities = { path = "../minotari_app_utilities", features = [
16-
"miner_input",
17-
] }
18-
minotari_node_grpc_client = { path = "../../clients/rust/base_node_grpc_client" }
19-
minotari_wallet_grpc_client = { path = "../../clients/rust/wallet_grpc_client" }
20-
tari_common = { path = "../../common" }
21-
tari_common_types = { path = "../../base_layer/common_types" }
22-
tari_comms = { path = "../../comms/core" }
23-
tari_core = { path = "../../base_layer/core", default-features = false, features = [
14+
minotari_app_grpc = { workspace = true }
15+
minotari_app_utilities = { workspace = true, features = ["miner_input"] }
16+
minotari_node_grpc_client = { workspace = true }
17+
minotari_wallet_grpc_client = { workspace = true }
18+
tari_common = { workspace = true }
19+
tari_common_types = { workspace = true }
20+
tari_comms = { workspace = true }
21+
tari_core = { workspace = true, default-features = false, features = [
2422
"transactions",
2523
] }
26-
tari_max_size = { path = "../../infrastructure/max_size" }
27-
tari_utilities = { version = "0.8" }
24+
tari_max_size = { workspace = true }
25+
tari_utilities = { workspace = true }
2826

2927
anyhow = "1.0.53"
3028
bincode = "1.3.1"
@@ -56,7 +54,7 @@ regex = "1.11.1"
5654
blake2 = "0.10"
5755

5856
[build-dependencies]
59-
tari_features = { path = "../../common/tari_features", version = "1.11.6-pre.0" }
57+
tari_features = { workspace = true }
6058

6159
[dev-dependencies]
6260
hyper = { version = "0.14.12", features = ["full"] }

0 commit comments

Comments
 (0)