X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=1d9e5afc46eecb7c66abac96528aa763a4030bbb;hb=8e7f241149b286b5bd467642fef06ad9daeb5c77;hp=5ec16f90fc9bbba19bebb59e25f6621cbab2a84f;hpb=35d4ebb208255724804187e3f10553c9383c9522;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index 5ec16f90..1d9e5afc 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -600,7 +600,14 @@ pub fn create_chan_between_nodes_with_value_confirm_first<'a, 'b, 'c, 'd>(node_r
 pub fn create_chan_between_nodes_with_value_confirm_second<'a, 'b, 'c>(node_recv: &Node<'a, 'b, 'c>, node_conf: &Node<'a, 'b, 'c>) -> ((msgs::FundingLocked, msgs::AnnouncementSignatures), [u8; 32]) {
 	let channel_id;
 	let events_6 = node_conf.node.get_and_clear_pending_msg_events();
-	assert_eq!(events_6.len(), 2);
+	assert_eq!(events_6.len(), 3);
+	let announcement_sigs_idx = if let MessageSendEvent::SendChannelUpdate { ref node_id, msg: _ } = events_6[1] {
+		assert_eq!(*node_id, node_recv.node.get_our_node_id());
+		2
+	} else if let MessageSendEvent::SendChannelUpdate { ref node_id, msg: _ } = events_6[2] {
+		assert_eq!(*node_id, node_recv.node.get_our_node_id());
+		1
+	} else { panic!("Unexpected event: {:?}", events_6[1]); };
 	((match events_6[0] {
 		MessageSendEvent::SendFundingLocked { ref node_id, ref msg } => {
 			channel_id = msg.channel_id.clone();
@@ -608,7 +615,7 @@ pub fn create_chan_between_nodes_with_value_confirm_second<'a, 'b, 'c>(node_recv
 			msg.clone()
 		},
 		_ => panic!("Unexpected event"),
-	}, match events_6[1] {
+	}, match events_6[announcement_sigs_idx] {
 		MessageSendEvent::SendAnnouncementSignatures { ref node_id, ref msg } => {
 			assert_eq!(*node_id, node_recv.node.get_our_node_id());
 			msg.clone()
@@ -1078,7 +1085,7 @@ macro_rules! get_route_and_payment_hash {
 		let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
 			.with_features($crate::ln::features::InvoiceFeatures::known())
 			.with_route_hints($last_hops);
-		let scorer = $crate::util::test_utils::TestScorer::with_fixed_penalty(0);
+		let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 		let route = $crate::routing::router::get_route(
 			&$send_node.node.get_our_node_id(), &payment_params, $send_node.network_graph,
 			Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
@@ -1095,7 +1102,7 @@ macro_rules! expect_pending_htlcs_forwardable_ignore {
 		let events = $node.node.get_and_clear_pending_events();
 		assert_eq!(events.len(), 1);
 		match events[0] {
-			Event::PendingHTLCsForwardable { .. } => { },
+			$crate::util::events::Event::PendingHTLCsForwardable { .. } => { },
 			_ => panic!("Unexpected event"),
 		};
 	}}
@@ -1130,18 +1137,22 @@ macro_rules! expect_pending_htlcs_forwardable_from_events {
 	}}
 }
 
-#[cfg(any(test, feature = "unstable"))]
+#[macro_export]
+#[cfg(any(test, feature = "_bench_unstable", feature = "_test_utils"))]
 macro_rules! expect_payment_received {
 	($node: expr, $expected_payment_hash: expr, $expected_payment_secret: expr, $expected_recv_value: expr) => {
+		expect_payment_received!($node, $expected_payment_hash, $expected_payment_secret, $expected_recv_value, None)
+	};
+	($node: expr, $expected_payment_hash: expr, $expected_payment_secret: expr, $expected_recv_value: expr, $expected_payment_preimage: expr) => {
 		let events = $node.node.get_and_clear_pending_events();
 		assert_eq!(events.len(), 1);
 		match events[0] {
-			Event::PaymentReceived { ref payment_hash, ref purpose, amt } => {
+			$crate::util::events::Event::PaymentReceived { ref payment_hash, ref purpose, amt } => {
 				assert_eq!($expected_payment_hash, *payment_hash);
 				assert_eq!($expected_recv_value, amt);
 				match purpose {
-					PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
-						assert!(payment_preimage.is_none());
+					$crate::util::events::PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
+						assert_eq!(&$expected_payment_preimage, payment_preimage);
 						assert_eq!($expected_payment_secret, *payment_secret);
 					},
 					_ => {},
@@ -1533,7 +1544,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;
 pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
 	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 		.with_features(InvoiceFeatures::known());
-	let scorer = test_utils::TestScorer::with_fixed_penalty(0);
+	let scorer = test_utils::TestScorer::with_penalty(0);
 	let route = get_route(
 		&origin_node.node.get_our_node_id(), &payment_params, &origin_node.network_graph,
 		Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
@@ -1551,9 +1562,9 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
 pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64)  {
 	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 		.with_features(InvoiceFeatures::known());
-	let scorer = test_utils::TestScorer::with_fixed_penalty(0);
+	let scorer = test_utils::TestScorer::with_penalty(0);
 	let route = get_route(
-		&origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph, 
+		&origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
 		None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 	assert_eq!(route.paths.len(), 1);
 	assert_eq!(route.paths[0].len(), expected_route.len());
@@ -2002,8 +2013,7 @@ macro_rules! handle_chan_reestablish_msgs {
 						idx += 1;
 						RAACommitmentOrder::CommitmentFirst
 					},
-					&MessageSendEvent::SendChannelUpdate { .. } => RAACommitmentOrder::CommitmentFirst,
-					_ => panic!("Unexpected event"),
+					_ => RAACommitmentOrder::CommitmentFirst,
 				}
 			} else {
 				RAACommitmentOrder::CommitmentFirst
@@ -2023,16 +2033,18 @@ macro_rules! handle_chan_reestablish_msgs {
 						commitment_update = Some(updates.clone());
 						idx += 1;
 					},
-					&MessageSendEvent::SendChannelUpdate { .. } => {},
-					_ => panic!("Unexpected event"),
+					_ => {},
 				}
 			}
 
 			if let Some(&MessageSendEvent::SendChannelUpdate { ref node_id, ref msg }) = msg_events.get(idx) {
 				assert_eq!(*node_id, $dst_node.node.get_our_node_id());
+				idx += 1;
 				assert_eq!(msg.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected.
 			}
 
+			assert_eq!(msg_events.len(), idx);
+
 			(funding_locked, revoke_and_ack, commitment_update, order)
 		}
 	}
@@ -2105,9 +2117,9 @@ pub fn reconnect_nodes<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a,
 			let announcement_event = node_a.node.get_and_clear_pending_msg_events();
 			if !announcement_event.is_empty() {
 				assert_eq!(announcement_event.len(), 1);
-				if let MessageSendEvent::SendAnnouncementSignatures { .. } = announcement_event[0] {
+				if let MessageSendEvent::SendChannelUpdate { .. } = announcement_event[0] {
 					//TODO: Test announcement_sigs re-sending
-				} else { panic!("Unexpected event!"); }
+				} else { panic!("Unexpected event! {:?}", announcement_event[0]); }
 			}
 		} else {
 			assert!(chan_msgs.0.is_none());
@@ -2162,9 +2174,11 @@ pub fn reconnect_nodes<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a,
 			let announcement_event = node_b.node.get_and_clear_pending_msg_events();
 			if !announcement_event.is_empty() {
 				assert_eq!(announcement_event.len(), 1);
-				if let MessageSendEvent::SendAnnouncementSignatures { .. } = announcement_event[0] {
-					//TODO: Test announcement_sigs re-sending
-				} else { panic!("Unexpected event!"); }
+				match announcement_event[0] {
+					MessageSendEvent::SendChannelUpdate { .. } => {},
+					MessageSendEvent::SendAnnouncementSignatures { .. } => {},
+					_ => panic!("Unexpected event {:?}!", announcement_event[0]),
+				}
 			}
 		} else {
 			assert!(chan_msgs.0.is_none());