X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=0d01961cd1b3f023f7bec7c3a6559b330d4bf34d;hb=fe8c10db95124e3238b7469bdabb00afc7c5bdd6;hp=a95d32476b4d3ead0a94e45bd42c5d6bda56f890;hpb=e635db0da31841e8a8ac5c5450c8f595541a6ced;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index a95d3247..0d01961c 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -763,21 +763,29 @@ macro_rules! check_closed_broadcast {
 	}}
 }
 
-/// Check that a channel's closing channel event has been issued
+/// Check that a channel's closing channel events has been issued
 #[macro_export]
 macro_rules! check_closed_event {
-	($node: expr, $events: expr, $reason: expr) => {{
+	($node: expr, $events: expr, $reason: expr) => {
+		check_closed_event!($node, $events, $reason, false);
+	};
+	($node: expr, $events: expr, $reason: expr, $is_check_discard_funding: expr) => {{
 		let events = $node.node.get_and_clear_pending_events();
 		assert_eq!(events.len(), $events);
 		let expected_reason = $reason;
+		let mut issues_discard_funding = false;
 		for event in events {
 			match event {
 				Event::ChannelClosed { ref reason, .. } => {
 					assert_eq!(*reason, expected_reason);
 				},
+				Event::DiscardFunding { .. } => {
+					issues_discard_funding = true;
+				}
 				_ => panic!("Unexpected event"),
 			}
 		}
+		assert_eq!($is_check_discard_funding, issues_discard_funding);
 	}}
 }
 
@@ -965,8 +973,9 @@ macro_rules! commitment_signed_dance {
 macro_rules! get_payment_preimage_hash {
 	($dest_node: expr) => {
 		{
-			let payment_preimage = PaymentPreimage([*$dest_node.network_payment_count.borrow(); 32]);
-			*$dest_node.network_payment_count.borrow_mut() += 1;
+			let mut payment_count = $dest_node.network_payment_count.borrow_mut();
+			let payment_preimage = PaymentPreimage([*payment_count; 32]);
+			*payment_count += 1;
 			let payment_hash = PaymentHash(Sha256::hash(&payment_preimage.0[..]).into_inner());
 			let payment_secret = $dest_node.node.create_inbound_payment_for_hash(payment_hash, None, 7200, 0).unwrap();
 			(payment_preimage, payment_hash, payment_secret)
@@ -981,7 +990,9 @@ macro_rules! get_route_and_payment_hash {
 		let net_graph_msg_handler = &$send_node.net_graph_msg_handler;
 		let route = get_route(&$send_node.node.get_our_node_id(),
 			&net_graph_msg_handler.network_graph,
-			&$recv_node.node.get_our_node_id(), None, None, &Vec::new(), $recv_value, TEST_FINAL_CLTV, $send_node.logger).unwrap();
+			&$recv_node.node.get_our_node_id(), None,
+			Some(&$send_node.node.list_usable_channels().iter().map(|a| a).collect::<Vec<_>>()),
+			&Vec::new(), $recv_value, TEST_FINAL_CLTV, $send_node.logger).unwrap();
 		(route, payment_hash, payment_preimage, payment_secret)
 	}}
 }