-f add ClosureReason tests

Author: Antoine Riard

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -28,7 +28,7 @@ use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
 use routing::router::get_route;
 use util::config::UserConfig;
 use util::enforcing_trait_impls::EnforcingSigner;
-use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
+use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason};
 use util::errors::APIError;
 use util::ser::{ReadableArgs, Writeable};
 use util::test_utils::TestBroadcaster;
@@ -81,7 +81,7 @@ fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
 	// PaymentFailed event
 
 	assert_eq!(nodes[0].node.list_channels().len(), 0);
-	check_closed_event!(nodes[0], 1);
+	check_closed_event!(nodes[0], 1, ClosureReason::DisconnectedPeer);
 }
 
 #[test]
@@ -270,7 +270,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
 	// PaymentFailed event
 
 	assert_eq!(nodes[0].node.list_channels().len(), 0);
-	check_closed_event!(nodes[0], 1);
+	check_closed_event!(nodes[0], 1, ClosureReason::DisconnectedPeer);
 }
 
 #[test]
@@ -1986,8 +1986,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
 
 	send_payment(&nodes[0], &[&nodes[1]], 8000000);
 	close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
-	check_closed_event!(nodes[0], 1);
-	check_closed_event!(nodes[1], 1);
+	check_closed_event!(nodes[0], 1, ClosureReason::DisconnectedPeer);
+	check_closed_event!(nodes[1], 1, ClosureReason::DisconnectedPeer);
 }
 
 #[test]
@@ -2616,8 +2616,8 @@ fn test_temporary_error_during_shutdown() {
 	assert_eq!(txn_a, txn_b);
 	assert_eq!(txn_a.len(), 1);
 	check_spends!(txn_a[0], funding_tx);
-	check_closed_event!(nodes[1], 1);
-	check_closed_event!(nodes[0], 1);
+	check_closed_event!(nodes[1], 1, ClosureReason::DisconnectedPeer);
+	check_closed_event!(nodes[0], 1, ClosureReason::DisconnectedPeer);
 }
 
 #[test]
@@ -2638,7 +2638,7 @@ fn test_permanent_error_during_sending_shutdown() {
 	assert!(nodes[0].node.close_channel(&channel_id).is_ok());
 	check_closed_broadcast!(nodes[0], true);
 	check_added_monitors!(nodes[0], 2);
-	check_closed_event!(nodes[0], 1);
+	check_closed_event!(nodes[0], 1, ClosureReason::DisconnectedPeer);
 }
 
 #[test]
@@ -2661,7 +2661,7 @@ fn test_permanent_error_during_handling_shutdown() {
 	nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &shutdown);
 	check_closed_broadcast!(nodes[1], true);
 	check_added_monitors!(nodes[1], 2);
-	check_closed_event!(nodes[1], 1);
+	check_closed_event!(nodes[1], 1, ClosureReason::DisconnectedPeer);
 }
 
 #[test]

lightning/src/ln/channelmanager.rs

@@ -5772,10 +5772,8 @@ mod tests {
 		nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 		check_added_monitors!(nodes[1], 0);
 		commitment_signed_dance!(nodes[1], nodes[0], payment_event.commitment_msg, false);
-		let events = nodes[1].node.get_and_clear_pending_events();
-		expect_pending_htlcs_forwardable!(nodes[1], events);
-		let events = nodes[1].node.get_and_clear_pending_events();
-		expect_pending_htlcs_forwardable!(nodes[1], events);
+		expect_pending_htlcs_forwardable!(nodes[1]);
+		expect_pending_htlcs_forwardable!(nodes[1]);
 		check_added_monitors!(nodes[1], 1);
 		let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
 		assert!(updates.update_add_htlcs.is_empty());

lightning/src/ln/functional_test_utils.rs

@@ -766,12 +766,12 @@ macro_rules! check_closed_broadcast {
 /// Check that a channel's closing channel event has been issued
 #[macro_export]
 macro_rules! check_closed_event {
-	($node: expr, $events: expr) => {{
+	($node: expr, $events: expr, $reason: expr) => {{
 		let events = $node.node.get_and_clear_pending_events();
 		assert_eq!(events.len(), $events);
 		match events[0] {
 			Event::ChannelClosed { ref reason, .. } => {
-				//assert_eq!(reason, $reason);
+				assert_eq!(*reason, $reason);
 			},
 			_ => panic!("Unexpected event"),
 		}
@@ -1324,8 +1324,7 @@ pub fn fail_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expe
 		assert_eq!(path.last().unwrap().node.get_our_node_id(), expected_paths[0].last().unwrap().node.get_our_node_id());
 	}
 	assert!(expected_paths[0].last().unwrap().node.fail_htlc_backwards(&our_payment_hash));
-	let events = expected_paths[0].last().unwrap().node.get_and_clear_pending_events();
-	expect_pending_htlcs_forwardable!(expected_paths[0].last().unwrap(), events);
+	expect_pending_htlcs_forwardable!(expected_paths[0].last().unwrap());
 	check_added_monitors!(expected_paths[0].last().unwrap(), expected_paths.len());
 
 	let mut per_path_msgs: Vec<((msgs::UpdateFailHTLC, msgs::CommitmentSigned), PublicKey)> = Vec::with_capacity(expected_paths.len());
@@ -1360,8 +1359,7 @@ pub fn fail_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expe
 				node.node.handle_update_fail_htlc(&prev_node.node.get_our_node_id(), &next_msgs.as_ref().unwrap().0);
 				commitment_signed_dance!(node, prev_node, next_msgs.as_ref().unwrap().1, update_next_node);
 				if !update_next_node {
-					let events = node.node.get_and_clear_pending_events();
-					expect_pending_htlcs_forwardable!(node, events);
+					expect_pending_htlcs_forwardable!(node);
 				}
 			}
 			let events = node.node.get_and_clear_pending_msg_events();