refactor successful_probe_yields_event

Author: alexanderwiederin

lightning/src/ln/payment_tests.rs

@@ -1161,47 +1161,13 @@ fn successful_probe_yields_event() {
 
 	let (route, _, _, _) = get_route_and_payment_hash!(&nodes[0], nodes[2], 100_000);
 
-	let (payment_hash, payment_id) = nodes[0].node.send_probe(route.paths[0].clone()).unwrap();
+	let res = nodes[0].node.send_probe(route.paths[0].clone()).unwrap();
 
-	// node[0] -- update_add_htlcs -> node[1]
-	check_added_monitors!(nodes[0], 1);
-	let updates = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
-	let probe_event = SendEvent::from_commitment_update(nodes[1].node.get_our_node_id(), updates);
-	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 updates = get_htlc_update_msgs!(nodes[1], nodes[2].node.get_our_node_id());
-	let probe_event = SendEvent::from_commitment_update(nodes[1].node.get_our_node_id(), updates);
-	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, true, true);
+	let expected_route: &[&[&Node]] = &[&[&nodes[1], &nodes[2]]];
 
-	// 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);
-
-	// 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);
+	pass_probe_along_route(&nodes[0], expected_route);
 
-	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], vec![res]);
 }
 
 #[test]