X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=bf9f3704417c342cfaf1ee2d2383f8dfd95ce531;hb=316a7941da44ed53c208a9c1b25225fc2685a4c6;hp=94cb30350b749eb50e91a3dd6c89d42ad7112529;hpb=52d76f97fcfe819e126b8613993559fa69c94dc6;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index 94cb3035..bf9f3704 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -665,6 +665,12 @@ pub fn get_err_msg(node: &Node, recipient: &PublicKey) -> msgs::ErrorMessage {
 			assert_eq!(node_id, recipient);
 			(*msg).clone()
 		},
+		MessageSendEvent::HandleError {
+			action: msgs::ErrorAction::DisconnectPeer { ref msg }, ref node_id
+		} => {
+			assert_eq!(node_id, recipient);
+			msg.as_ref().unwrap().clone()
+		},
 		_ => panic!("Unexpected event"),
 	}
 }
@@ -1446,10 +1452,15 @@ pub fn check_closed_broadcast(node: &Node, num_channels: usize, with_error_msg:
 				assert_eq!(msg.contents.flags & 2, 2);
 				None
 			},
-			MessageSendEvent::HandleError { action: msgs::ErrorAction::SendErrorMessage { ref msg }, node_id: _ } => {
+			MessageSendEvent::HandleError { action: msgs::ErrorAction::SendErrorMessage { msg }, node_id: _ } => {
 				assert!(with_error_msg);
 				// TODO: Check node_id
-				Some(msg.clone())
+				Some(msg)
+			},
+			MessageSendEvent::HandleError { action: msgs::ErrorAction::DisconnectPeer { msg }, node_id: _ } => {
+				assert!(with_error_msg);
+				// TODO: Check node_id
+				Some(msg.unwrap())
 			},
 			_ => panic!("Unexpected event"),
 		}
@@ -1467,27 +1478,61 @@ macro_rules! check_closed_broadcast {
 	}
 }
 
+#[derive(Default)]
+pub struct ExpectedCloseEvent {
+	pub channel_capacity_sats: Option<u64>,
+	pub channel_id: Option<ChannelId>,
+	pub counterparty_node_id: Option<PublicKey>,
+	pub discard_funding: bool,
+	pub reason: Option<ClosureReason>,
+}
+
+/// Check that multiple channel closing events have been issued.
+pub fn check_closed_events(node: &Node, expected_close_events: &[ExpectedCloseEvent]) {
+	let closed_events_count = expected_close_events.len();
+	let discard_events_count = expected_close_events.iter().filter(|e| e.discard_funding).count();
+	let events = node.node.get_and_clear_pending_events();
+	assert_eq!(events.len(), closed_events_count + discard_events_count, "{:?}", events);
+	for expected_event in expected_close_events {
+		assert!(events.iter().any(|e| matches!(
+			e,
+			Event::ChannelClosed {
+				channel_id,
+				reason,
+				counterparty_node_id,
+				channel_capacity_sats,
+				..
+			} 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)
+			)
+		)));
+	}
+	assert_eq!(events.iter().filter(|e| matches!(
+		e,
+		Event::DiscardFunding { .. },
+	)).count(), discard_events_count);
+}
+
 /// Check that a channel's closing channel events has been issued
 pub fn check_closed_event(node: &Node, events_count: usize, expected_reason: ClosureReason, is_check_discard_funding: bool,
 	expected_counterparty_node_ids: &[PublicKey], expected_channel_capacity: u64) {
-	let events = node.node.get_and_clear_pending_events();
-	assert_eq!(events.len(), events_count, "{:?}", events);
-	let mut issues_discard_funding = false;
-	for event in events {
-		match event {
-			Event::ChannelClosed { ref reason, counterparty_node_id,
-				channel_capacity_sats, .. } => {
-				assert_eq!(*reason, expected_reason);
-				assert!(expected_counterparty_node_ids.iter().any(|id| id == &counterparty_node_id.unwrap()));
-				assert_eq!(channel_capacity_sats.unwrap(), expected_channel_capacity);
-			},
-			Event::DiscardFunding { .. } => {
-				issues_discard_funding = true;
-			}
-			_ => panic!("Unexpected event"),
-		}
-	}
-	assert_eq!(is_check_discard_funding, issues_discard_funding);
+	let expected_events_count = if is_check_discard_funding {
+		2 * expected_counterparty_node_ids.len()
+	} else {
+		expected_counterparty_node_ids.len()
+	};
+	assert_eq!(events_count, expected_events_count);
+	let expected_close_events = expected_counterparty_node_ids.iter().map(|node_id| ExpectedCloseEvent {
+		channel_capacity_sats: Some(expected_channel_capacity),
+		channel_id: None,
+		counterparty_node_id: Some(*node_id),
+		discard_funding: is_check_discard_funding,
+		reason: Some(expected_reason.clone()),
+	}).collect::<Vec<_>>();
+	check_closed_events(node, expected_close_events.as_slice());
 }
 
 /// Check that a channel's closing channel events has been issued
@@ -2795,7 +2840,8 @@ pub fn create_network<'a, 'b: 'a, 'c: 'b>(node_count: usize, cfgs: &'b Vec<NodeC
 }
 
 // Note that the following only works for CLTV values up to 128
-pub const ACCEPTED_HTLC_SCRIPT_WEIGHT: usize = 137; //Here we have a diff due to HTLC CLTV expiry being < 2^15 in test
+pub const ACCEPTED_HTLC_SCRIPT_WEIGHT: usize = 137; // Here we have a diff due to HTLC CLTV expiry being < 2^15 in test
+pub const ACCEPTED_HTLC_SCRIPT_WEIGHT_ANCHORS: usize = 140; // Here we have a diff due to HTLC CLTV expiry being < 2^15 in test
 
 #[derive(PartialEq)]
 pub enum HTLCType { NONE, TIMEOUT, SUCCESS }
@@ -2920,6 +2966,13 @@ pub fn handle_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, '
 				nodes[b].node.handle_error(&nodes[a].node.get_our_node_id(), msg);
 			}
 		},
+		MessageSendEvent::HandleError { node_id, action: msgs::ErrorAction::DisconnectPeer { ref msg } } => {
+			assert_eq!(node_id, nodes[b].node.get_our_node_id());
+			assert_eq!(msg.as_ref().unwrap().data, expected_error);
+			if needs_err_handle {
+				nodes[b].node.handle_error(&nodes[a].node.get_our_node_id(), msg.as_ref().unwrap());
+			}
+		},
 		_ => panic!("Unexpected event"),
 	}
 
@@ -2937,6 +2990,10 @@ pub fn handle_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, '
 				assert_eq!(node_id, nodes[a].node.get_our_node_id());
 				assert_eq!(msg.data, expected_error);
 			},
+			MessageSendEvent::HandleError { node_id, action: msgs::ErrorAction::DisconnectPeer { ref msg } } => {
+				assert_eq!(node_id, nodes[a].node.get_our_node_id());
+				assert_eq!(msg.as_ref().unwrap().data, expected_error);
+			},
 			_ => panic!("Unexpected event"),
 		}
 	}