refactor preflight_probes_yield_event_and_skip

Author: alexanderwiederin

lightning/src/ln/payment_tests.rs

@@ -1325,7 +1325,7 @@ fn preflight_probes_yield_event_and_skip() {
 	//                   \                  /
 	//                    (70k:0)- N3 -(1M:0)
 	//
-	let first_chan_update = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100_000, 0).0;
+	create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100_000, 0);
 	create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 30_000, 0);
 	create_announced_chan_between_nodes_with_value(&nodes, 1, 3, 70_000, 0);
 	create_announced_chan_between_nodes_with_value(&nodes, 2, 4, 1_000_000, 0);
@@ -1340,65 +1340,14 @@ fn preflight_probes_yield_event_and_skip() {
 	let route_params = RouteParameters { payment_params, final_value_msat: 80_000_000 };
 	let res = nodes[0].node.send_preflight_probes(route_params, None).unwrap();
 
+	let expected_route : &[&[&Node]] = &[&[&nodes[1], &nodes[2], &nodes[4]]];
+
 	// We check that only one probe was sent, the other one was skipped due to limited liquidity.
 	assert_eq!(res.len(), 1);
-	let log_msg = format!("Skipped sending payment probe to avoid putting channel {} under the liquidity limit.",
-		first_chan_update.contents.short_channel_id);
-	node_cfgs[0].logger.assert_log_contains("lightning::ln::channelmanager", &log_msg, 1);
-
-	let (payment_hash, payment_id) = res.first().unwrap();
-
-	// node[0] -- update_add_htlcs -> node[1]
-	check_added_monitors!(nodes[0], 1);
-	let probe_event = SendEvent::from_node(&nodes[0]);
-	nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &probe_event.msgs[0]);
-	check_added_monitors!(nodes[1], 0);
-	commitment_signed_dance!(nodes[1], nodes[0], probe_event.commitment_msg, false);
-	expect_pending_htlcs_forwardable!(nodes[1]);
-
-	// node[1] -- update_add_htlcs -> node[2]
-	check_added_monitors!(nodes[1], 1);
-	let probe_event = SendEvent::from_node(&nodes[1]);
-	nodes[2].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &probe_event.msgs[0]);
-	check_added_monitors!(nodes[2], 0);
-	commitment_signed_dance!(nodes[2], nodes[1], probe_event.commitment_msg, false);
-	expect_pending_htlcs_forwardable!(nodes[2]);
-
-	// node[2] -- update_add_htlcs -> node[4]
-	check_added_monitors!(nodes[2], 1);
-	let probe_event = SendEvent::from_node(&nodes[2]);
-	nodes[4].node.handle_update_add_htlc(&nodes[2].node.get_our_node_id(), &probe_event.msgs[0]);
-	check_added_monitors!(nodes[4], 0);
-	commitment_signed_dance!(nodes[4], nodes[2], probe_event.commitment_msg, true, true);
-
-	// node[2] <- update_fail_htlcs -- node[4]
-	let updates = get_htlc_update_msgs!(nodes[4], nodes[2].node.get_our_node_id());
-	nodes[2].node.handle_update_fail_htlc(&nodes[4].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
-	check_added_monitors!(nodes[2], 0);
-	commitment_signed_dance!(nodes[2], nodes[4], updates.commitment_signed, true);
 
-	// node[1] <- update_fail_htlcs -- node[2]
-	let updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
-	nodes[1].node.handle_update_fail_htlc(&nodes[2].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
-	check_added_monitors!(nodes[1], 0);
-	commitment_signed_dance!(nodes[1], nodes[2], updates.commitment_signed, true);
+	pass_probe_along_route(&nodes[0], expected_route);
 
-	// node[0] <- update_fail_htlcs -- node[1]
-	let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
-	nodes[0].node.handle_update_fail_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
-	check_added_monitors!(nodes[0], 0);
-	commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, false);
-
-	let mut events = nodes[0].node.get_and_clear_pending_events();
-	assert_eq!(events.len(), 1);
-	match events.drain(..).next().unwrap() {
-		crate::events::Event::ProbeSuccessful { payment_id: ev_pid, payment_hash: ev_ph, .. } => {
-			assert_eq!(*payment_id, ev_pid);
-			assert_eq!(*payment_hash, ev_ph);
-		},
-		_ => panic!(),
-	};
-	assert!(!nodes[0].node.has_pending_payments());
+	expect_probe_successful_events(&nodes[0], res);
 }
 
 #[test]