f update test to new api

Author: TheBlueMatt

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -1989,8 +1989,8 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
 	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 
 	let chan_id = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 15_000_000, 7_000_000_000, InitFeatures::known(), InitFeatures::known()).2;
-	let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(&nodes[0]);
-	let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(&nodes[0]);
+	let (payment_preimage_1, payment_hash_1, payment_secret_1) = get_payment_preimage_hash!(&nodes[1]);
+	let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(&nodes[1]);
 
 	// Do a really complicated dance to get an HTLC into the holding cell, with MonitorUpdateFailed
 	// set but AwaitingRemoteRevoke unset. When this test was written, any attempts to send an HTLC
@@ -2011,23 +2011,23 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
 	//
 	// Note that because, at the end, MonitorUpdateFailed is still set, the HTLC generated in (c)
 	// will not be freed from the holding cell.
-	let (payment_preimage_0, _) = route_payment(&nodes[1], &[&nodes[0]], 100000);
+	let (payment_preimage_0, _, _) = route_payment(&nodes[1], &[&nodes[0]], 100000);
 
 	let route = {
 		let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 		get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), None, None, &Vec::new(), 100000, TEST_FINAL_CLTV, nodes[0].logger).unwrap()
 	};
 
-	nodes[0].node.send_payment(&route, payment_hash_1, &None).unwrap();
+	nodes[0].node.send_payment(&route, payment_hash_1, &Some(payment_secret_1)).unwrap();
 	check_added_monitors!(nodes[0], 1);
 	let send = SendEvent::from_node(&nodes[0]);
 	assert_eq!(send.msgs.len(), 1);
 
-	nodes[0].node.send_payment(&route, payment_hash_2, &None).unwrap();
+	nodes[0].node.send_payment(&route, payment_hash_2, &Some(payment_secret_2)).unwrap();
 	check_added_monitors!(nodes[0], 0);
 
 	*nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
-	assert!(nodes[0].node.claim_funds(payment_preimage_0, &None, 100000));
+	assert!(nodes[0].node.claim_funds(payment_preimage_0));
 	check_added_monitors!(nodes[0], 1);
 
 	nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send.msgs[0]);
@@ -2156,16 +2156,16 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
 	let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 	nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
 	expect_pending_htlcs_forwardable!(nodes[1]);
-	expect_payment_received!(nodes[1], payment_hash_1, 100000);
+	expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 100000);
 	check_added_monitors!(nodes[1], 1);
 
 	commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
 
 	expect_pending_htlcs_forwardable!(nodes[1]);
-	expect_payment_received!(nodes[1], payment_hash_2, 100000);
+	expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 100000);
 
-	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1, 100000);
-	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2, 100000);
+	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
+	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
 }
 #[test]
 fn channel_holding_cell_serialize() {