Skip to content

Commit bb00964

Browse files
joostjagerjoostjager
committed
DROPME: point to rust-lightning branch
1 parent d32a7b3 commit bb00964

File tree

1 file changed

+37
-36
lines changed

1 file changed

+37
-36
lines changed

‎Cargo.toml

+37-36
Original file line numberDiff line numberDiff line change
@@ -39,39 +39,40 @@ default = []
3939
#lightning-transaction-sync = { version = "0.1.0", features = ["esplora-async-https", "time"] }
4040
#lightning-liquidity = { version = "0.1.0", features = ["std"] }
4141

42-
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
43-
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
44-
#lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
45-
#lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
46-
#lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
47-
#lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["futures"] }
48-
#lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
49-
#lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["rpc-client", "tokio"] }
50-
#lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["esplora-async-https", "time"] }
51-
#lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
52-
53-
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std"] }
54-
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
55-
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std"] }
56-
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
57-
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
58-
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["futures"] }
59-
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
60-
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["rpc-client", "tokio"] }
61-
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["esplora-async-https", "time"] }
62-
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
63-
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
64-
65-
#lightning = { path = "../rust-lightning/lightning", features = ["std"] }
66-
#lightning-types = { path = "../rust-lightning/lightning-types" }
67-
#lightning-invoice = { path = "../rust-lightning/lightning-invoice", features = ["std"] }
68-
#lightning-net-tokio = { path = "../rust-lightning/lightning-net-tokio" }
69-
#lightning-persister = { path = "../rust-lightning/lightning-persister" }
70-
#lightning-background-processor = { path = "../rust-lightning/lightning-background-processor", features = ["futures"] }
71-
#lightning-rapid-gossip-sync = { path = "../rust-lightning/lightning-rapid-gossip-sync" }
72-
#lightning-block-sync = { path = "../rust-lightning/lightning-block-sync", features = ["rpc-client", "tokio"] }
73-
#lightning-transaction-sync = { path = "../rust-lightning/lightning-transaction-sync", features = ["esplora-async-https", "time"] }
74-
#lightning-liquidity = { path = "../rust-lightning/lightning-liquidity", features = ["std"] }
42+
#lightning = { git = "https://github.com/joostjager/rust-lightning", branch = "merge-scores", features = ["std"] }
43+
#lightning-types = { git = "https://github.com/joostjager/rust-lightning", branch = "merge-scores" }
44+
#lightning-invoice = { git = "https://github.com/joostjager/rust-lightning", branch = "merge-scores", features = ["std"] }
45+
#lightning-net-tokio = { git = "https://github.com/joostjager/rust-lightning", branch = "merge-scores" }
46+
#lightning-persister = { git = "https://github.com/joostjager/rust-lightning", branch = "merge-scores" }
47+
#lightning-background-processor = { git = "https://github.com/joostjager/rust-lightning", branch = "merge-scores", features = ["futures"] }
48+
#lightning-rapid-gossip-sync = { git = "https://github.com/joostjager/rust-lightning", branch = "merge-scores" }
49+
#lightning-block-sync = { git = "https://github.com/joostjager/rust-lightning", branch = "merge-scores", features = ["rpc-client", "tokio"] }
50+
#lightning-transaction-sync = { git = "https://github.com/joostjager/rust-lightning", branch = "merge-scores", features = ["esplora-async-https", "time"] }
51+
#lightning-liquidity = { git = "https://github.com/joostjager/rust-lightning", branch = "merge-scores" }
52+
53+
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std"] }
54+
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
55+
#lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std"] }
56+
#lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
57+
#lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
58+
#lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["futures"] }
59+
#lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
60+
#lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["rpc-client", "tokio"] }
61+
#lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["esplora-async-https", "time"] }
62+
#lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
63+
#lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
64+
65+
lightning = { path = "../rust-lightning/lightning", features = ["std"] }
66+
lightning-types = { path = "../rust-lightning/lightning-types" }
67+
lightning-invoice = { path = "../rust-lightning/lightning-invoice", features = ["std"] }
68+
lightning-net-tokio = { path = "../rust-lightning/lightning-net-tokio" }
69+
lightning-persister = { path = "../rust-lightning/lightning-persister" }
70+
lightning-background-processor = { path = "../rust-lightning/lightning-background-processor", features = ["futures"] }
71+
lightning-rapid-gossip-sync = { path = "../rust-lightning/lightning-rapid-gossip-sync" }
72+
lightning-block-sync = { path = "../rust-lightning/lightning-block-sync", features = ["rpc-client", "tokio"] }
73+
lightning-transaction-sync = { path = "../rust-lightning/lightning-transaction-sync", features = ["esplora-async-https", "time"] }
74+
lightning-liquidity = { path = "../rust-lightning/lightning-liquidity", features = ["std"] }
75+
lightning-macros = { path = "../rust-lightning/lightning-macros" }
7576

7677
bdk_chain = { version = "0.21.1", default-features = false, features = ["std"] }
7778
bdk_esplora = { version = "0.20.1", default-features = false, features = ["async-https-rustls", "tokio"]}
@@ -102,9 +103,9 @@ winapi = { version = "0.3", features = ["winbase"] }
102103

103104
[dev-dependencies]
104105
#lightning = { version = "0.1.0", features = ["std", "_test_utils"] }
105-
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
106-
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std", "_test_utils"] }
107-
#lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
106+
#lightning = { git = "https://github.com/joostjager/rust-lightning", branch="merge-scores", features = ["std", "_test_utils"] }
107+
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std", "_test_utils"] }
108+
lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
108109
electrum-client = { version = "0.21.0", default-features = true }
109110
bitcoincore-rpc = { version = "0.19.0", default-features = false }
110111
proptest = "1.0.0"

0 commit comments

Comments
 (0)