X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=91365d5a29bb6761f5d9a8a30bbda2626954aef2;hb=ecadae9f0f424113b144dde32c43b4c30abe76b0;hp=5c75fc48899e553d77b4f2dc20ad057ead305646;hpb=c0199224ab24cb37934bc14b5a52ab6415429308;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index 5c75fc48..91365d5a 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -786,49 +786,57 @@ macro_rules! expect_payment_failed {
 pub fn send_along_route_with_secret<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, route: Route, expected_paths: &[&[&Node<'a, 'b, 'c>]], recv_value: u64, our_payment_hash: PaymentHash, our_payment_secret: Option<PaymentSecret>) {
 	origin_node.node.send_payment(&route, our_payment_hash, &our_payment_secret).unwrap();
 	check_added_monitors!(origin_node, expected_paths.len());
+	pass_along_route(origin_node, expected_paths, recv_value, our_payment_hash, our_payment_secret);
+}
 
-	let mut events = origin_node.node.get_and_clear_pending_msg_events();
-	assert_eq!(events.len(), expected_paths.len());
-	for (path_idx, (ev, expected_route)) in events.drain(..).zip(expected_paths.iter()).enumerate() {
-		let mut payment_event = SendEvent::from_event(ev);
-		let mut prev_node = origin_node;
-
-		for (idx, &node) in expected_route.iter().enumerate() {
-			assert_eq!(node.node.get_our_node_id(), payment_event.node_id);
-
-			node.node.handle_update_add_htlc(&prev_node.node.get_our_node_id(), &payment_event.msgs[0]);
-			check_added_monitors!(node, 0);
-			commitment_signed_dance!(node, prev_node, payment_event.commitment_msg, false);
-
-			expect_pending_htlcs_forwardable!(node);
-
-			if idx == expected_route.len() - 1 {
-				let events_2 = node.node.get_and_clear_pending_events();
-				// Once we've gotten through all the HTLCs, the last one should result in a
-				// PaymentReceived (but each previous one should not!).
-				if path_idx == expected_paths.len() - 1 {
-					assert_eq!(events_2.len(), 1);
-					match events_2[0] {
-						Event::PaymentReceived { ref payment_hash, ref payment_secret, amt } => {
-							assert_eq!(our_payment_hash, *payment_hash);
-							assert_eq!(our_payment_secret, *payment_secret);
-							assert_eq!(amt, recv_value);
-						},
-						_ => panic!("Unexpected event"),
-					}
-				} else {
-					assert!(events_2.is_empty());
+pub fn pass_along_path<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_path: &[&Node<'a, 'b, 'c>], recv_value: u64, our_payment_hash: PaymentHash, our_payment_secret: Option<PaymentSecret>, ev: MessageSendEvent, payment_received_expected: bool) {
+	let mut payment_event = SendEvent::from_event(ev);
+	let mut prev_node = origin_node;
+
+	for (idx, &node) in expected_path.iter().enumerate() {
+		assert_eq!(node.node.get_our_node_id(), payment_event.node_id);
+
+		node.node.handle_update_add_htlc(&prev_node.node.get_our_node_id(), &payment_event.msgs[0]);
+		check_added_monitors!(node, 0);
+		commitment_signed_dance!(node, prev_node, payment_event.commitment_msg, false);
+
+		expect_pending_htlcs_forwardable!(node);
+
+		if idx == expected_path.len() - 1 {
+			let events_2 = node.node.get_and_clear_pending_events();
+			if payment_received_expected {
+				assert_eq!(events_2.len(), 1);
+				match events_2[0] {
+					Event::PaymentReceived { ref payment_hash, ref payment_secret, amt } => {
+						assert_eq!(our_payment_hash, *payment_hash);
+						assert_eq!(our_payment_secret, *payment_secret);
+						assert_eq!(amt, recv_value);
+					},
+					_ => panic!("Unexpected event"),
 				}
 			} else {
-				let mut events_2 = node.node.get_and_clear_pending_msg_events();
-				assert_eq!(events_2.len(), 1);
-				check_added_monitors!(node, 1);
-				payment_event = SendEvent::from_event(events_2.remove(0));
-				assert_eq!(payment_event.msgs.len(), 1);
+				assert!(events_2.is_empty());
 			}
-
-			prev_node = node;
+		} else {
+			let mut events_2 = node.node.get_and_clear_pending_msg_events();
+			assert_eq!(events_2.len(), 1);
+			check_added_monitors!(node, 1);
+			payment_event = SendEvent::from_event(events_2.remove(0));
+			assert_eq!(payment_event.msgs.len(), 1);
 		}
+
+		prev_node = node;
+	}
+}
+
+pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&[&Node<'a, 'b, 'c>]], recv_value: u64, our_payment_hash: PaymentHash, our_payment_secret: Option<PaymentSecret>) {
+	let mut events = origin_node.node.get_and_clear_pending_msg_events();
+	assert_eq!(events.len(), expected_route.len());
+	for (path_idx, (ev, expected_path)) in events.drain(..).zip(expected_route.iter()).enumerate() {
+		// Once we've gotten through all the HTLCs, the last one should result in a
+		// PaymentReceived (but each previous one should not!), .
+		let expect_payment = path_idx == expected_route.len() - 1;
+		pass_along_path(origin_node, expected_path, recv_value, our_payment_hash.clone(), our_payment_secret, ev, expect_payment);
 	}
 }