From 0f7aa2f7fae2fbef321a73d2e3aab8899e9f4dc6 Mon Sep 17 00:00:00 2001 From: wiesche Date: Mon, 17 Aug 2026 10:02:31 +0200 Subject: [PATCH] centralize grin workspace dependencies (#787) --- Cargo.toml | 18 +++++++++++++----- api/Cargo.toml | 6 +++--- config/Cargo.toml | 4 ++-- controller/Cargo.toml | 12 ++++++------ impls/Cargo.toml | 12 ++++++------ libwallet/Cargo.toml | 8 ++++---- util/Cargo.toml | 2 +- 7 files changed, 35 insertions(+), 27 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 901278d..ea2bfd4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,14 @@ path = "src/bin/grin-wallet.rs" members = ["api", "config", "controller", "impls", "libwallet", "util"] exclude = ["integration"] +[workspace.dependencies] +grin_api = { path = "grin/api" } +grin_chain = { path = "grin/chain" } +grin_core = { path = "grin/core" } +grin_keychain = { path = "grin/keychain" } +grin_store = { path = "grin/store" } +grin_util = { path = "grin/util" } + [dependencies] clap = { version = "2.33", features = ["yaml"] } rpassword = "7.5.4" @@ -37,10 +45,10 @@ grin_wallet_config = { path = "./config", version = "5.5.0" } ##### Grin Imports -grin_core = { path = "grin/core"} -grin_keychain = { path = "grin/keychain"} -grin_util = { path = "grin/util"} -grin_api = { path = "grin/api"} +grin_core = { workspace = true } +grin_keychain = { workspace = true } +grin_util = { workspace = true } +grin_api = { workspace = true } ###### @@ -51,4 +59,4 @@ built = { version = "0.8.0", features = ["git2"]} url = "2.1" serde = "1" serde_json = "1" -easy-jsonrpc-mw = "0.5.4" \ No newline at end of file +easy-jsonrpc-mw = "0.5.4" diff --git a/api/Cargo.toml b/api/Cargo.toml index c797161..e7f61e0 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -29,9 +29,9 @@ grin_wallet_util = { path = "../util", version = "5.5.0" } ##### Grin Imports -grin_core = { path = "../grin/core"} -grin_keychain = { path = "../grin/keychain"} -grin_util = { path = "../grin/util"} +grin_core = { workspace = true } +grin_keychain = { workspace = true } +grin_util = { workspace = true } ##### diff --git a/config/Cargo.toml b/config/Cargo.toml index 5d7e339..b059a3f 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -20,8 +20,8 @@ lazy_static = "1" ##### Grin Imports -grin_core = { path = "../grin/core"} -grin_util = { path = "../grin/util"} +grin_core = { workspace = true } +grin_util = { workspace = true } ##### diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 5de94f2..ea8938c 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -33,13 +33,13 @@ grin_wallet_config = { path = "../config", version = "5.5.0" } ##### Grin Imports -grin_core = { path = "../grin/core"} -grin_keychain = { path = "../grin/keychain"} -grin_util = { path = "../grin/util"} -grin_api = { path = "../grin/api"} -grin_chain = { path = "../grin/chain"} +grin_core = { workspace = true } +grin_keychain = { workspace = true } +grin_util = { workspace = true } +grin_api = { workspace = true } +grin_chain = { workspace = true } ##### [dev-dependencies] -ed25519-dalek = "2" \ No newline at end of file +ed25519-dalek = "2" diff --git a/impls/Cargo.toml b/impls/Cargo.toml index bb4add2..35f032f 100644 --- a/impls/Cargo.toml +++ b/impls/Cargo.toml @@ -53,10 +53,10 @@ grin_wallet_libwallet = { path = "../libwallet", version = "5.5.0" } ##### Grin Imports -grin_core = { path = "../grin/core"} -grin_keychain = { path = "../grin/keychain"} -grin_chain = { path = "../grin/chain"} -grin_util = { path = "../grin/util"} -grin_api = { path = "../grin/api"} +grin_core = { workspace = true } +grin_keychain = { workspace = true } +grin_chain = { workspace = true } +grin_util = { workspace = true } +grin_api = { workspace = true } -##### \ No newline at end of file +##### diff --git a/libwallet/Cargo.toml b/libwallet/Cargo.toml index c6bfe82..7844c8b 100644 --- a/libwallet/Cargo.toml +++ b/libwallet/Cargo.toml @@ -47,9 +47,9 @@ grin_wallet_config = { path = "../config", version = "5.5.0" } ##### Grin Imports -grin_core = { path = "../grin/core"} -grin_keychain = { path = "../grin/keychain"} -grin_util = { path = "../grin/util"} -grin_store = { path = "../grin/store"} +grin_core = { workspace = true } +grin_keychain = { workspace = true } +grin_util = { workspace = true } +grin_store = { workspace = true } ##### diff --git a/util/Cargo.toml b/util/Cargo.toml index 898522d..b4a30d6 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -19,6 +19,6 @@ thiserror = "1" ##### Grin Imports -grin_util = { path = "../grin/util"} +grin_util = { workspace = true } ######