Bump LDK dependency for check_closed_broadcast

The macro was removed in favor of a function.

Author: jkczyz

Cargo.toml

@@ -39,17 +39,17 @@ default = []
 #lightning-liquidity = { version = "0.2.0", features = ["std"] }
 #lightning-macros = { version = "0.2.0" }
 
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae", features = ["std"] }
-lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae" }
-lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae", features = ["std"] }
-lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae" }
-lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae", features = ["tokio"] }
-lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae" }
-lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae" }
-lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae", features = ["rest-client", "rpc-client", "tokio"] }
-lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
-lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae", features = ["std"] }
-lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae" }
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["std"] }
+lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f" }
+lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["std"] }
+lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f" }
+lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["tokio"] }
+lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f" }
+lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f" }
+lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["rest-client", "rpc-client", "tokio"] }
+lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
+lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["std"] }
+lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f" }
 
 bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
 bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
@@ -78,13 +78,13 @@ log = { version = "0.4.22", default-features = false, features = ["std"]}
 vss-client = { package = "vss-client-ng", version = "0.4" }
 prost = { version = "0.11.6", default-features = false}
 #bitcoin-payment-instructions = { version = "0.6" }
-bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "3daaed987e0948e9c82c233aec268c7b84d78eea" }
+bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "d3d1f9fd6d59ad901834af5cc2d2d44743d5f28e" }
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winbase"] }
 
 [dev-dependencies]
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "16ea4c7e2e05573bcffb3d6aa92592c24d5132ae", features = ["std", "_test_utils"] }
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["std", "_test_utils"] }
 proptest = "1.0.0"
 regex = "1.5.6"
 criterion = { version = "0.7.0", features = ["async_tokio"] }

src/io/test_utils.rs

@@ -12,16 +12,17 @@ use std::path::PathBuf;
 use std::sync::Mutex;
 
 use lightning::events::ClosureReason;
+use lightning::io;
 use lightning::ln::functional_test_utils::{
-	check_added_monitors, check_closed_event, connect_block, create_announced_chan_between_nodes,
-	create_chanmon_cfgs, create_dummy_block, create_network, create_node_cfgs,
-	create_node_chanmgrs, send_payment, test_legacy_channel_config, TestChanMonCfg,
+	check_added_monitors, check_closed_broadcast, check_closed_event, connect_block,
+	create_announced_chan_between_nodes, create_chanmon_cfgs, create_dummy_block, create_network,
+	create_node_cfgs, create_node_chanmgrs, send_payment, test_legacy_channel_config,
+	TestChanMonCfg,
 };
 use lightning::util::persist::{
 	KVStore, KVStoreSync, MonitorUpdatingPersister, KVSTORE_NAMESPACE_KEY_MAX_LEN,
 };
 use lightning::util::test_utils;
-use lightning::{check_closed_broadcast, io};
 use rand::distr::Alphanumeric;
 use rand::{rng, Rng};
 
@@ -334,7 +335,7 @@ pub(crate) fn do_test_store<K: KVStoreSync + Sync>(store_0: &K, store_1: &K) {
 		&[nodes[1].node.get_our_node_id()],
 		100000,
 	);
-	check_closed_broadcast!(nodes[0], true);
+	check_closed_broadcast(&nodes[0], 1, true);
 	check_added_monitors(&nodes[0], 1);
 
 	let node_txn = nodes[0].tx_broadcaster.txn_broadcast();
@@ -343,7 +344,7 @@ pub(crate) fn do_test_store<K: KVStoreSync + Sync>(store_0: &K, store_1: &K) {
 	let dummy_block = create_dummy_block(nodes[0].best_block_hash(), 42, txn);
 	connect_block(&nodes[1], &dummy_block);
 
-	check_closed_broadcast!(nodes[1], true);
+	check_closed_broadcast(&nodes[1], 1, true);
 	let reason = ClosureReason::CommitmentTxConfirmed;
 	let node_id_0 = nodes[0].node.get_our_node_id();
 	check_closed_event(&nodes[1], 1, reason, &[node_id_0], 100000);