From 8a743693bab905246ba7f74709378ccddf17c5ac Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 7 Apr 2023 16:29:19 +0000 Subject: [PATCH] Fix silent merge conflict between new test and payment refactor --- lightning/src/ln/payment_tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lightning/src/ln/payment_tests.rs b/lightning/src/ln/payment_tests.rs index a3b94c4c9..8fc582745 100644 --- a/lightning/src/ln/payment_tests.rs +++ b/lightning/src/ln/payment_tests.rs @@ -2917,7 +2917,7 @@ fn do_claim_from_closed_chan(fail_payment: bool) { let final_cltv = nodes[0].best_block_info().1 + TEST_FINAL_CLTV + 8 + 1; nodes[0].router.expect_find_route(route_params.clone(), Ok(route.clone())); - nodes[0].node.send_payment_with_retry(payment_hash, &Some(payment_secret), + nodes[0].node.send_payment(payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0), route_params.clone(), Retry::Attempts(1)).unwrap(); check_added_monitors(&nodes[0], 2); let mut send_msgs = nodes[0].node.get_and_clear_pending_msg_events(); -- 2.39.5