Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: use workspace dependencies instead #6583

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
+63 −40
Open

refactor: use workspace dependencies instead #6583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,36 @@ members = [
"applications/minotari_ledger_wallet/comms",
"applications/minotari_ledger_wallet/common",
"integration_tests",
"hashing"
"hashing",
]

# Add here until we move to edition=2021
resolver = "2"


[workspace.dependencies]
tari_common_types = { path = "base_layer/common_types" }
tari_comms = { path = "comms/core" }
tari_core = { path = "base_layer/core" }
tari_crypto = { version = "0.20.3" }
tari_script = { path = "infrastructure/tari_script" }
tari_max_size = { path = "infrastructure/max_size" }
tari_utilities = { version = "0.7" }
tari_features = { path = "common/tari_features", version = "1.5.1-pre.0" }
minotari_app_grpc = { path = "applications/minotari_app_grpc" }
minotari_app_utilities = { path = "applications/minotari_app_utilities" }
minotari_ledger_wallet_comms = { path = "applications/minotari_ledger_wallet/comms", version = "1.5.1-pre.0" }
tari_common = { path = "common" }
tari_comms_dht = { path = "comms/dht" }
tari_contacts = { path = "base_layer/contacts" }
tari_key_manager = { path = "base_layer/key_manager" }
tari_libtor = { path = "infrastructure/libtor" }
tari_p2p = { path = "base_layer/p2p" }
tari_shutdown = { path = "infrastructure/shutdown" }
minotari_wallet = { path = "base_layer/wallet" }
tari_hashing = { path = "hashing" }
minotari_ledger_wallet_common = { path = "applications/minotari_ledger_wallet/common" }

[profile.release]
# By default, Rust will wrap an integer in release mode instead of throwing the overflow error
# seen in debug mode. Panicking at this time is better than silently using the wrong value.
Expand Down
16 changes: 8 additions & 8 deletions applications/minotari_app_grpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ version = "1.5.1-pre.0"
edition = "2018"

[dependencies]
tari_common_types = { path = "../../base_layer/common_types" }
tari_comms = { path = "../../comms/core" }
tari_core = { path = "../../base_layer/core" }
tari_crypto = { version = "0.20.3" }
tari_script = { path = "../../infrastructure/tari_script" }
tari_max_size = { path = "../../infrastructure/max_size" }
tari_utilities = { version = "0.7" }
tari_common_types = { workspace = true }
tari_comms = { workspace = true }
tari_core = { workspace = true }
tari_crypto = { workspace = true }
tari_script = { workspace = true }
tari_max_size = { workspace = true }
tari_utilities = { workspace = true }

argon2 = { version = "0.4.1", features = ["std", "password-hash"] }
base64 = "0.13.0"
Expand All @@ -32,7 +32,7 @@ tonic = { version = "0.8.3", features = ["tls"] }
zeroize = "1"

[build-dependencies]
tari_features = { path = "../../common/tari_features", version = "1.5.1-pre.0" }
tari_features = { workspace = true }
tonic-build = "0.8.4"

[package.metadata.cargo-machete]
Expand Down
49 changes: 24 additions & 25 deletions applications/minotari_console_wallet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,24 @@ edition = "2018"
license = "BSD-3-Clause"

[dependencies]
minotari_app_grpc = { path = "../minotari_app_grpc" }
minotari_app_utilities = { path = "../minotari_app_utilities" }
minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.5.1-pre.0", optional = true }
tari_common = { path = "../../common" }
tari_common_types = { path = "../../base_layer/common_types" }
tari_comms = { path = "../../comms/core" }
tari_comms_dht = { path = "../../comms/dht" }
tari_contacts = { path = "../../base_layer/contacts" }
tari_crypto = { version = "0.20.3" }
tari_key_manager = { path = "../../base_layer/key_manager" }
tari_libtor = { path = "../../infrastructure/libtor", optional = true }
tari_max_size = { path = "../../infrastructure/max_size" }
tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
tari_script = { path = "../../infrastructure/tari_script" }
tari_shutdown = { path = "../../infrastructure/shutdown" }
tari_utilities = { version = "0.7" }
minotari_wallet = { path = "../../base_layer/wallet", features = [
"bundled_sqlite",
] }
tari_hashing = { path = "../../hashing" }
minotari_app_grpc = { workspace = true }
minotari_app_utilities = { workspace = true }
minotari_ledger_wallet_comms = { workspace = true, optional = true }
tari_common = { workspace = true }
tari_common_types = { workspace = true }
tari_comms = { workspace = true }
tari_comms_dht = { workspace = true }
tari_contacts = { workspace = true }
tari_crypto = { workspace = true }
tari_key_manager = { workspace = true }
tari_libtor = { workspace = true, optional = true }
tari_max_size = { workspace = true }
tari_p2p = { workspace = true, features = ["auto-update"] }
tari_script = { workspace = true }
tari_shutdown = { workspace = true }
tari_utilities = { workspace = true }
minotari_wallet = { workspace = true, features = ["bundled_sqlite"] }
tari_hashing = { workspace = true }

# Uncomment for tokio tracing via tokio-console (needs "tracing" featurs)
console-subscriber = "0.1.8"
Expand Down Expand Up @@ -73,18 +71,19 @@ url = "2.3.1"
zeroize = "1"
zxcvbn = "2"

[dependencies.tari_core]
path = "../../base_layer/core"
default-features = false
features = ["transactions", "mempool_proto", "base_node_proto"]
tari_core = { workspace = true, default-features = false, features = [
"transactions",
"mempool_proto",
"base_node_proto",
] }

[dependencies.tui]
version = "^0.16"
default-features = false
features = ["crossterm"]

[build-dependencies]
tari_features = { path = "../../common/tari_features", version = "1.5.1-pre.0" }
tari_features = { workspace = true }

[features]
default = ["libtor", "ledger"]
Expand Down
12 changes: 6 additions & 6 deletions applications/minotari_ledger_wallet/comms/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ license = "BSD-3-Clause"
edition = "2021"

[dependencies]
tari_crypto = { version = "0.20.2", default-features = false }
tari_utilities = { version = "0.7" }
tari_common = { path = "../../../common" }
tari_common_types = { path = "../../../base_layer/common_types" }
tari_script = { path = "../../../infrastructure/tari_script" }
tari_crypto = { workspace = true, default-features = false }
tari_utilities = { workspace = true }
tari_common = { workspace = true }
tari_common_types = { workspace = true }
tari_script = { workspace = true }

minotari_ledger_wallet_common = { path = "../common" }
minotari_ledger_wallet_common = { workspace = true }
semver = "1.0"
borsh = "1.2"
dialoguer = { version = "0.11" }
Expand Down