testz

Author: TheBlueMatt

lightning/src/ln/functional_test_utils.rs

@@ -847,20 +847,30 @@ macro_rules! commitment_signed_dance {
 	($node_a: expr, $node_b: expr, $commitment_signed: expr, $fail_backwards: expr, true /* skip last step */) => {
 		{
 			check_added_monitors!($node_a, 0);
-			assert!($node_a.node.get_and_clear_pending_msg_events().is_empty());
+			assert!($node_a.node.get_and_clear_pending_msg_events().is_empty(), "A");
 			$node_a.node.handle_commitment_signed(&$node_b.node.get_our_node_id(), &$commitment_signed);
-			check_added_monitors!($node_a, 1);
+			//check_added_monitors!($node_a, 1);
+		{
+			let mut added_monitors = $node_a.chain_monitor.added_monitors.lock().unwrap();
+			assert!(added_monitors.len() == 1, "10");
+			added_monitors.clear();
+		}
 			commitment_signed_dance!($node_a, $node_b, (), $fail_backwards, true, false);
 		}
 	};
 	($node_a: expr, $node_b: expr, (), $fail_backwards: expr, true /* skip last step */, true /* return extra message */, true /* return last RAA */) => {
 		{
 			let (as_revoke_and_ack, as_commitment_signed) = get_revoke_commit_msgs!($node_a, $node_b.node.get_our_node_id());
 			check_added_monitors!($node_b, 0);
-			assert!($node_b.node.get_and_clear_pending_msg_events().is_empty());
+			assert!($node_b.node.get_and_clear_pending_msg_events().is_empty(), "B");
 			$node_b.node.handle_revoke_and_ack(&$node_a.node.get_our_node_id(), &as_revoke_and_ack);
-			assert!($node_b.node.get_and_clear_pending_msg_events().is_empty());
-			check_added_monitors!($node_b, 1);
+			assert!($node_b.node.get_and_clear_pending_msg_events().is_empty(), "C");
+		{
+			let mut added_monitors = $node_b.chain_monitor.added_monitors.lock().unwrap();
+			assert!(added_monitors.len() == 1, "2");
+			added_monitors.clear();
+		}
+			//check_added_monitors!($node_b, 1);
 			$node_b.node.handle_commitment_signed(&$node_a.node.get_our_node_id(), &as_commitment_signed);
 			let (bs_revoke_and_ack, extra_msg_option) = {
 				let events = $node_b.node.get_and_clear_pending_msg_events();
@@ -873,20 +883,30 @@ macro_rules! commitment_signed_dance {
 					_ => panic!("Unexpected event"),
 				}, events.get(1).map(|e| e.clone()))
 			};
-			check_added_monitors!($node_b, 1);
+		{
+			let mut added_monitors = $node_b.chain_monitor.added_monitors.lock().unwrap();
+			assert!(added_monitors.len() == 1, "3");
+			added_monitors.clear();
+		}
+			//check_added_monitors!($node_b, 1);
 			if $fail_backwards {
 				assert!($node_a.node.get_and_clear_pending_events().is_empty());
-				assert!($node_a.node.get_and_clear_pending_msg_events().is_empty());
+				assert!($node_a.node.get_and_clear_pending_msg_events().is_empty(), "D");
 			}
 			(extra_msg_option, bs_revoke_and_ack)
 		}
 	};
 	($node_a: expr, $node_b: expr, $commitment_signed: expr, $fail_backwards: expr, true /* skip last step */, false /* return extra message */, true /* return last RAA */) => {
 		{
 			check_added_monitors!($node_a, 0);
-			assert!($node_a.node.get_and_clear_pending_msg_events().is_empty());
+			assert!($node_a.node.get_and_clear_pending_msg_events().is_empty(), "E");
 			$node_a.node.handle_commitment_signed(&$node_b.node.get_our_node_id(), &$commitment_signed);
-			check_added_monitors!($node_a, 1);
+			//check_added_monitors!($node_a, 1);
+		{
+			let mut added_monitors = $node_a.chain_monitor.added_monitors.lock().unwrap();
+			assert!(added_monitors.len() == 1, "4");
+			added_monitors.clear();
+		}
 			let (extra_msg_option, bs_revoke_and_ack) = commitment_signed_dance!($node_a, $node_b, (), $fail_backwards, true, true, true);
 			assert!(extra_msg_option.is_none());
 			bs_revoke_and_ack
@@ -896,7 +916,12 @@ macro_rules! commitment_signed_dance {
 		{
 			let (extra_msg_option, bs_revoke_and_ack) = commitment_signed_dance!($node_a, $node_b, (), $fail_backwards, true, true, true);
 			$node_a.node.handle_revoke_and_ack(&$node_b.node.get_our_node_id(), &bs_revoke_and_ack);
-			check_added_monitors!($node_a, 1);
+			//check_added_monitors!($node_a, 1);
+		{
+			let mut added_monitors = $node_a.chain_monitor.added_monitors.lock().unwrap();
+			assert!(added_monitors.len() == 1, "5");
+			added_monitors.clear();
+		}
 			extra_msg_option
 		}
 	};
@@ -910,15 +935,20 @@ macro_rules! commitment_signed_dance {
 			commitment_signed_dance!($node_a, $node_b, $commitment_signed, $fail_backwards, true);
 			if $fail_backwards {
 				expect_pending_htlcs_forwardable!($node_a);
-				check_added_monitors!($node_a, 1);
+				//check_added_monitors!($node_a, 1);
+		{
+			let mut added_monitors = $node_a.chain_monitor.added_monitors.lock().unwrap();
+			assert!(added_monitors.len() == 1, "6");
+			added_monitors.clear();
+		}
 
 				let channel_state = $node_a.node.channel_state.lock().unwrap();
-				assert_eq!(channel_state.pending_msg_events.len(), 1);
+				assert!(channel_state.pending_msg_events.len() == 1, "42");
 				if let MessageSendEvent::UpdateHTLCs { ref node_id, .. } = channel_state.pending_msg_events[0] {
 					assert_ne!(*node_id, $node_b.node.get_our_node_id());
 				} else { panic!("Unexpected event"); }
 			} else {
-				assert!($node_a.node.get_and_clear_pending_msg_events().is_empty());
+				assert!($node_a.node.get_and_clear_pending_msg_events().is_empty(), "F");
 			}
 		}
 	}
@@ -953,7 +983,7 @@ macro_rules! get_route_and_payment_hash {
 macro_rules! expect_pending_htlcs_forwardable_ignore {
 	($node: expr) => {{
 		let events = $node.node.get_and_clear_pending_events();
-		assert_eq!(events.len(), 1);
+		assert_eq!(events.len(), 1, "hello");
 		match events[0] {
 			Event::PendingHTLCsForwardable { .. } => { },
 			_ => panic!("Unexpected event"),