X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fpriv_short_conf_tests.rs;h=7aef89595991774195ff5e5204227fbc2ce4d833;hb=88e1b56d66ff550b36a6d422f47c9b9729406f61;hp=3d799df8d7327d5f0895804f66c64e94cfa94b7d;hpb=2c9dbb959d0c16ee97baf70074d0a31a0c0443e8;p=rust-lightning

diff --git a/lightning/src/ln/priv_short_conf_tests.rs b/lightning/src/ln/priv_short_conf_tests.rs
index 3d799df8..7aef8959 100644
--- a/lightning/src/ln/priv_short_conf_tests.rs
+++ b/lightning/src/ln/priv_short_conf_tests.rs
@@ -18,7 +18,8 @@ use crate::ln::channelmanager::{MIN_CLTV_EXPIRY_DELTA, PaymentId, RecipientOnion
 use crate::routing::gossip::RoutingFees;
 use crate::routing::router::{PaymentParameters, RouteHint, RouteHintHop};
 use crate::ln::features::ChannelTypeFeatures;
-use crate::ln::{msgs, ChannelId};
+use crate::ln::msgs;
+use crate::ln::types::ChannelId;
 use crate::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, ChannelUpdate, ErrorAction};
 use crate::ln::wire::Encode;
 use crate::util::config::{UserConfig, MaxDustHTLCExposure};
@@ -26,12 +27,11 @@ use crate::util::ser::Writeable;
 use crate::util::test_utils;
 
 use crate::prelude::*;
-use core::default::Default;
 
 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() {
@@ -754,6 +754,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 +763,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());
 }