cargo: Consolidate CLN and VLS dependencies into workspace

We are referencing a number of external git repos. We want them to stay in sync, so move them to the workspace.
Blockstream · Nov 17, 2023 · 4785a7e · 4785a7e
1 parent 996278e
commit 4785a7e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,6 +21,13 @@ members = [
 [workspace.dependencies]
 anyhow = "1"
 env_logger = "0.10"
+cln-grpc = {git = "https://github.com/cdecker/lightning.git", tag = "gl-20231113" }
+cln-rpc = {git = "https://github.com/cdecker/lightning.git", tag = "gl-20231113" }
+vls-core = { git="https://gitlab.com/cdecker/vls", tag="snapshot-20230920" }
+vls-persist = { git="https://gitlab.com/cdecker/vls", tag="snapshot-20230920" }
+vls-protocol-signer = { git="https://gitlab.com/cdecker/vls", tag="snapshot-20230920" }
+vls-protocol = { git="https://gitlab.com/cdecker/vls", tag="snapshot-20230920" }
+
 
 # Config for 'cargo dist'
 [workspace.metadata.dist]

diff --git a/libs/gl-client/Cargo.toml b/libs/gl-client/Cargo.toml
@@ -39,10 +39,10 @@ tempfile = "3.3.0"
 url = "2.4.0"
 bitcoin = "^0"
 serde = { version = "1", features = [ "derive" ] }
-vls-core = { git="https://gitlab.com/cdecker/vls", tag="snapshot-20230920" }
-vls-persist = { git="https://gitlab.com/cdecker/vls", tag="snapshot-20230920" }
-vls-protocol-signer = { git="https://gitlab.com/cdecker/vls", tag="snapshot-20230920" }
-vls-protocol = { git="https://gitlab.com/cdecker/vls", tag="snapshot-20230920" }
+vls-core = { workspace = true }
+vls-persist = { workspace = true }
+vls-protocol-signer = { workspace = true }
+vls-protocol = { workspace = true }
 serde_json = "^1.0"
 thiserror = "1"
 cln-grpc = "^0.1"

diff --git a/libs/gl-plugin/Cargo.toml b/libs/gl-plugin/Cargo.toml
@@ -19,8 +19,11 @@ anyhow = "*"
 async-stream = "*"
 bytes = { version = "1", features = ["serde"] }
 clightningrpc = "*"
-cln-grpc = {git = "https://github.com/cdecker/lightning.git", tag = "gl-20231113", features = ["server"] }
-cln-rpc = {git = "https://github.com/cdecker/lightning.git", tag = "gl-20231113"}
+cln-grpc = { workspace = true, features = ["server"] }
+cln-rpc = { workspace = true }
+#cln-grpc = {git = "https://github.com/cdecker/lightning.git", tag = "gl-20231113", features = ["server"] }
+#cln-rpc = {git = "https://github.com/cdecker/lightning.git", tag = "gl-20231113"}
+vls-protocol = { workspace = true }
 cln-plugin = "^0.1"
 env_logger = "^0.7.0"
 futures = "0.3"