Skip to content

Commit 2c72e67

Browse files
committed
Use [patch] instead of switching all the dependencies
We previously added a bunch of commented-out `rust-lightning` dependencies in our `Cargo.toml` to be able to easily switch between `rust-lightning` locations. However, this is exactly what the `[patch]` command is for, which in particular also allows to patch a dependency for the whole tree, not only this one project. Therefore, we move the examples to a commented-out `patch` section.
1 parent eaad8f5 commit 2c72e67

File tree

1 file changed

+37
-39
lines changed

1 file changed

+37
-39
lines changed

Cargo.toml

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -41,42 +41,6 @@ lightning-transaction-sync = { version = "0.2.0-rc1", features = ["esplora-async
4141
lightning-liquidity = { version = "0.2.0-rc1", features = ["std"] }
4242
lightning-macros = { version = "0.2.0-rc1" }
4343

44-
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
45-
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
46-
#lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
47-
#lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
48-
#lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["tokio"] }
49-
#lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
50-
#lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
51-
#lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["rest-client", "rpc-client", "tokio"] }
52-
#lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["esplora-async-https", "electrum-rustls-ring", "time"] }
53-
#lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
54-
#lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
55-
56-
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["std"] }
57-
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
58-
#lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["std"] }
59-
#lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
60-
#lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["tokio"] }
61-
#lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
62-
#lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
63-
#lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["rest-client", "rpc-client", "tokio"] }
64-
#lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["esplora-async-https", "electrum-rustls-ring", "time"] }
65-
#lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
66-
#lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
67-
68-
#lightning = { path = "../rust-lightning/lightning", features = ["std"] }
69-
#lightning-types = { path = "../rust-lightning/lightning-types" }
70-
#lightning-invoice = { path = "../rust-lightning/lightning-invoice", features = ["std"] }
71-
#lightning-net-tokio = { path = "../rust-lightning/lightning-net-tokio" }
72-
#lightning-persister = { path = "../rust-lightning/lightning-persister", features = ["tokio"] }
73-
#lightning-background-processor = { path = "../rust-lightning/lightning-background-processor" }
74-
#lightning-rapid-gossip-sync = { path = "../rust-lightning/lightning-rapid-gossip-sync" }
75-
#lightning-block-sync = { path = "../rust-lightning/lightning-block-sync", features = ["rest-client", "rpc-client", "tokio"] }
76-
#lightning-transaction-sync = { path = "../rust-lightning/lightning-transaction-sync", features = ["esplora-async-https", "electrum-rustls-ring", "time"] }
77-
#lightning-liquidity = { path = "../rust-lightning/lightning-liquidity", features = ["std"] }
78-
#lightning-macros = { path = "../rust-lightning/lightning-macros" }
79-
8044
bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
8145
bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
8246
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
@@ -109,9 +73,6 @@ winapi = { version = "0.3", features = ["winbase"] }
10973

11074
[dev-dependencies]
11175
lightning = { version = "0.2.0-rc1", features = ["std", "_test_utils"] }
112-
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
113-
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["std", "_test_utils"] }
114-
#lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
11576
proptest = "1.0.0"
11677
regex = "1.5.6"
11778
criterion = { version = "0.7.0", features = ["async_tokio"] }
@@ -153,3 +114,40 @@ check-cfg = [
153114
[[bench]]
154115
name = "payments"
155116
harness = false
117+
118+
#[patch.crates-io]
119+
#lightning = { path = "../rust-lightning/lightning" }
120+
#lightning-types = { path = "../rust-lightning/lightning-types" }
121+
#lightning-invoice = { path = "../rust-lightning/lightning-invoice" }
122+
#lightning-net-tokio = { path = "../rust-lightning/lightning-net-tokio" }
123+
#lightning-persister = { path = "../rust-lightning/lightning-persister" }
124+
#lightning-background-processor = { path = "../rust-lightning/lightning-background-processor" }
125+
#lightning-rapid-gossip-sync = { path = "../rust-lightning/lightning-rapid-gossip-sync" }
126+
#lightning-block-sync = { path = "../rust-lightning/lightning-block-sync" }
127+
#lightning-transaction-sync = { path = "../rust-lightning/lightning-transaction-sync" }
128+
#lightning-liquidity = { path = "../rust-lightning/lightning-liquidity" }
129+
#lightning-macros = { path = "../rust-lightning/lightning-macros" }
130+
131+
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
132+
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
133+
#lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
134+
#lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
135+
#lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
136+
#lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
137+
#lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
138+
#lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
139+
#lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
140+
#lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
141+
#lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
142+
143+
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
144+
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
145+
#lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
146+
#lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
147+
#lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
148+
#lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
149+
#lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
150+
#lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
151+
#lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
152+
#lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
153+
#lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }

0 commit comments

Comments
 (0)