X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=d153a0a4c2d7b964f6c4d4f6656e7959a7de6c88;hb=4b70921c958181e43dc056dc05ef59427d13f2af;hp=5828ca8038ca241a8d8c6d96464cbe3555bfc1ef;hpb=e1897de60643f2d31113ae98d2fe9bd36f8192ef;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index 5828ca80..d153a0a4 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -1218,7 +1218,7 @@ pub fn open_zero_conf_channel<'a, 'b, 'c, 'd>(initiator: &'a Node<'b, 'c, 'd>, r
 	(tx, as_channel_ready.channel_id)
 }
 
-pub fn create_chan_between_nodes_with_value_init<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, channel_value: u64, push_msat: u64) -> Transaction {
+pub fn exchange_open_accept_chan<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, channel_value: u64, push_msat: u64) -> ChannelId {
 	let create_chan_id = node_a.node.create_channel(node_b.node.get_our_node_id(), channel_value, push_msat, 42, None, None).unwrap();
 	let open_channel_msg = get_event_msg!(node_a, MessageSendEvent::SendOpenChannel, node_b.node.get_our_node_id());
 	assert_eq!(open_channel_msg.temporary_channel_id, create_chan_id);
@@ -1238,6 +1238,11 @@ pub fn create_chan_between_nodes_with_value_init<'a, 'b, 'c>(node_a: &Node<'a, '
 	node_a.node.handle_accept_channel(&node_b.node.get_our_node_id(), &accept_channel_msg);
 	assert_ne!(node_b.node.list_channels().iter().find(|channel| channel.channel_id == create_chan_id).unwrap().user_channel_id, 0);
 
+	create_chan_id
+}
+
+pub fn create_chan_between_nodes_with_value_init<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, channel_value: u64, push_msat: u64) -> Transaction {
+	let create_chan_id = exchange_open_accept_chan(node_a, node_b, channel_value, push_msat);
 	sign_funding_transaction(node_a, node_b, channel_value, create_chan_id)
 }
 
@@ -1534,6 +1539,22 @@ pub struct ExpectedCloseEvent {
 	pub counterparty_node_id: Option<PublicKey>,
 	pub discard_funding: bool,
 	pub reason: Option<ClosureReason>,
+	pub channel_funding_txo: Option<OutPoint>,
+	pub user_channel_id: Option<u128>,
+}
+
+impl ExpectedCloseEvent {
+	pub fn from_id_reason(channel_id: ChannelId, discard_funding: bool, reason: ClosureReason) -> Self {
+		Self {
+			channel_capacity_sats: None,
+			channel_id: Some(channel_id),
+			counterparty_node_id: None,
+			discard_funding,
+			reason: Some(reason),
+			channel_funding_txo: None,
+			user_channel_id: None,
+		}
+	}
 }
 
 /// Check that multiple channel closing events have been issued.
@@ -1550,12 +1571,20 @@ pub fn check_closed_events(node: &Node, expected_close_events: &[ExpectedCloseEv
 				reason,
 				counterparty_node_id,
 				channel_capacity_sats,
+				channel_funding_txo,
+				user_channel_id,
 				..
 			} if (
 				expected_event.channel_id.map(|expected| *channel_id == expected).unwrap_or(true) &&
 				expected_event.reason.as_ref().map(|expected| reason == expected).unwrap_or(true) &&
-				expected_event.counterparty_node_id.map(|expected| *counterparty_node_id == Some(expected)).unwrap_or(true) &&
-				expected_event.channel_capacity_sats.map(|expected| *channel_capacity_sats == Some(expected)).unwrap_or(true)
+				expected_event.
+					counterparty_node_id.map(|expected| *counterparty_node_id == Some(expected)).unwrap_or(true) &&
+				expected_event.channel_capacity_sats
+					.map(|expected| *channel_capacity_sats == Some(expected)).unwrap_or(true) &&
+				expected_event.channel_funding_txo
+					.map(|expected| *channel_funding_txo == Some(expected)).unwrap_or(true) &&
+				expected_event.user_channel_id
+					.map(|expected| *user_channel_id == expected).unwrap_or(true)
 			)
 		)));
 	}
@@ -1580,6 +1609,8 @@ pub fn check_closed_event(node: &Node, events_count: usize, expected_reason: Clo
 		counterparty_node_id: Some(*node_id),
 		discard_funding: is_check_discard_funding,
 		reason: Some(expected_reason.clone()),
+		channel_funding_txo: None,
+		user_channel_id: None,
 	}).collect::<Vec<_>>();
 	check_closed_events(node, expected_close_events.as_slice());
 }