f rebase

Author: TheBlueMatt

lightning/src/ln/functional_tests.rs

@@ -10008,7 +10008,8 @@ fn do_test_multi_post_event_actions(do_reload: bool) {
 	let (route, payment_hash_3, payment_preimage_3, payment_secret_3) =
 		get_route_and_payment_hash!(nodes[1], nodes[0], 100_000);
 	let payment_id = PaymentId(payment_hash_3.0);
-	nodes[1].node.send_payment(&route, payment_hash_3, &Some(payment_secret_3), payment_id).unwrap();
+	nodes[1].node.send_payment_with_route(&route, payment_hash_3,
+		RecipientOnionFields::secret_only(payment_secret_3), payment_id).unwrap();
 	check_added_monitors(&nodes[1], 1);
 
 	let send_event = SendEvent::from_node(&nodes[1]);