X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fpriv_short_conf_tests.rs;h=e747315c98c85f26371529a2b50fa46bb8d919f1;hb=refs%2Fheads%2Fupstream%2Fmain;hp=fba97eae382905d8d28f544b6afc65897f440ecc;hpb=33b9ba558c6b651e8d282052867e701f1543cec6;p=rust-lightning

diff --git a/lightning/src/ln/priv_short_conf_tests.rs b/lightning/src/ln/priv_short_conf_tests.rs
index fba97eae..e747315c 100644
--- a/lightning/src/ln/priv_short_conf_tests.rs
+++ b/lightning/src/ln/priv_short_conf_tests.rs
@@ -31,7 +31,7 @@ use crate::prelude::*;
 use crate::ln::functional_test_utils::*;
 
 use bitcoin::blockdata::constants::ChainHash;
-use bitcoin::network::constants::Network;
+use bitcoin::network::Network;
 
 #[test]
 fn test_priv_forwarding_rejection() {
@@ -508,7 +508,8 @@ fn test_scid_alias_returned() {
 		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: last_hop[0].inbound_scid_alias.unwrap(),
 		timestamp: 21,
-		flags: 1,
+		message_flags: 1, // Only must_be_one
+		channel_flags: 1,
 		cltv_expiry_delta: accept_forward_cfg.channel_config.cltv_expiry_delta,
 		htlc_minimum_msat: 1_000,
 		htlc_maximum_msat: 1_000_000, // Defaults to 10% of the channel value
@@ -754,6 +755,7 @@ fn test_0conf_close_no_early_chan_update() {
 
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, Some(chan_config)]);
 	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
+	let error_message = "Channel force-closed";
 
 	// This is the default but we force it on anyway
 	chan_config.channel_handshake_config.announced_channel = true;
@@ -762,9 +764,9 @@ fn test_0conf_close_no_early_chan_update() {
 	// We can use the channel immediately, but won't generate a channel_update until we get confs
 	send_payment(&nodes[0], &[&nodes[1]], 100_000);
 
-	nodes[0].node.force_close_all_channels_broadcasting_latest_txn();
+	nodes[0].node.force_close_all_channels_broadcasting_latest_txn(error_message.to_string());
 	check_added_monitors!(nodes[0], 1);
-	check_closed_event!(&nodes[0], 1, ClosureReason::HolderForceClosed, [nodes[1].node.get_our_node_id()], 100000);
+	check_closed_event!(&nodes[0], 1, ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true) }, [nodes[1].node.get_our_node_id()], 100000);
 	let _ = get_err_msg(&nodes[0], &nodes[1].node.get_our_node_id());
 }