X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_tests.rs;h=1d67b736ae386e6e09d696973ec103806b13e896;hb=44e87b86f27a1a6ff3860e8ab87a52e756aa7cc8;hp=555c8a4e9e8b7ab3eb5e61c8055b1f8eefd215e3;hpb=be8797e17ab5c56582340d1f5e57f92477ede69d;p=rust-lightning

diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs
index 555c8a4e..1d67b736 100644
--- a/lightning/src/ln/functional_tests.rs
+++ b/lightning/src/ln/functional_tests.rs
@@ -8654,7 +8654,7 @@ fn test_pre_lockin_no_chan_closed_update() {
 	nodes[0].node.handle_error(&nodes[1].node.get_our_node_id(), &msgs::ErrorMessage { channel_id, data: "Hi".to_owned() });
 	assert!(nodes[0].chain_monitor.added_monitors.lock().unwrap().is_empty());
 	check_closed_event!(nodes[0], 2, ClosureReason::CounterpartyForceClosed { peer_msg: UntrustedString("Hi".to_string()) }, true,
-		[nodes[1].node.get_our_node_id(); 2], 100000);
+		[nodes[1].node.get_our_node_id()], 100000);
 }
 
 #[test]
@@ -10499,26 +10499,18 @@ fn test_disconnect_in_funding_batch() {
 	// The channels in the batch will close immediately.
 	let channel_id_1 = OutPoint { txid: tx.txid(), index: 0 }.to_channel_id();
 	let channel_id_2 = OutPoint { txid: tx.txid(), index: 1 }.to_channel_id();
-	let events = nodes[0].node.get_and_clear_pending_events();
-	assert_eq!(events.len(), 4);
-	assert!(events.iter().any(|e| matches!(
-		e,
-		Event::ChannelClosed {
-			channel_id,
-			..
-		} if channel_id == &channel_id_1
-	)));
-	assert!(events.iter().any(|e| matches!(
-		e,
-		Event::ChannelClosed {
-			channel_id,
-			..
-		} if channel_id == &channel_id_2
-	)));
-	assert_eq!(events.iter().filter(|e| matches!(
-		e,
-		Event::DiscardFunding { .. },
-	)).count(), 2);
+	check_closed_events(&nodes[0], &[
+		ExpectedCloseEvent {
+			channel_id: Some(channel_id_1),
+			discard_funding: true,
+			..Default::default()
+		},
+		ExpectedCloseEvent {
+			channel_id: Some(channel_id_2),
+			discard_funding: true,
+			..Default::default()
+		},
+	]);
 
 	// The monitor should become closed.
 	check_added_monitors(&nodes[0], 1);
@@ -10602,26 +10594,18 @@ fn test_batch_funding_close_after_funding_signed() {
 	}
 
 	// All channels in the batch should close immediately.
-	let events = nodes[0].node.get_and_clear_pending_events();
-	assert_eq!(events.len(), 4);
-	assert!(events.iter().any(|e| matches!(
-		e,
-		Event::ChannelClosed {
-			channel_id,
-			..
-		} if channel_id == &channel_id_1
-	)));
-	assert!(events.iter().any(|e| matches!(
-		e,
-		Event::ChannelClosed {
-			channel_id,
-			..
-		} if channel_id == &channel_id_2
-	)));
-	assert_eq!(events.iter().filter(|e| matches!(
-		e,
-		Event::DiscardFunding { .. },
-	)).count(), 2);
+	check_closed_events(&nodes[0], &[
+		ExpectedCloseEvent {
+			channel_id: Some(channel_id_1),
+			discard_funding: true,
+			..Default::default()
+		},
+		ExpectedCloseEvent {
+			channel_id: Some(channel_id_2),
+			discard_funding: true,
+			..Default::default()
+		},
+	]);
 
 	// Ensure the channels don't exist anymore.
 	assert!(nodes[0].node.list_channels().is_empty());