f update to new api

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -2417,8 +2417,13 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 	/// an [`Event::PaymentFailed`] event will be generated as soon as there are no remaining
 	/// pending HTLCs for this payment.
 	///
+	/// Note that calling this method does *not* prevent a payment from succeeding. You must still
+	/// wait until you receive either a [`Event::PaymentFailed`] or [`Event::PaymentSent`] event to
+	/// determine the ultimate status of a payment.
+	///
 	/// [`retry_payment`]: Self::retry_payment
 	/// [`Event::PaymentFailed`]: events::Event::PaymentFailed
+	/// [`Event::PaymentSent`]: events::Event::PaymentSent
 	pub fn abandon_payment(&self, payment_id: PaymentId) {
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 

lightning/src/ln/functional_test_utils.rs

@@ -1305,7 +1305,7 @@ macro_rules! expect_payment_failed_conditions {
 			_ => panic!("Unexpected event"),
 		};
 		if !$conditions.expected_mpp_parts_remain {
-			$node.node.no_further_payment_retries(expected_payment_id);
+			$node.node.abandon_payment(expected_payment_id);
 			let events = $node.node.get_and_clear_pending_events();
 			assert_eq!(events.len(), 1);
 			match events[0] {
@@ -1633,7 +1633,7 @@ pub fn fail_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expe
 				_ => panic!("Unexpected event"),
 			}
 			if i == expected_paths.len() - 1 {
-				origin_node.node.no_further_payment_retries(our_payment_id);
+				origin_node.node.abandon_payment(our_payment_id);
 				let events = origin_node.node.get_and_clear_pending_events();
 				assert_eq!(events.len(), 1);
 				match events[0] {

lightning/src/util/events.rs

@@ -234,11 +234,11 @@ pub enum Event {
 	/// [`all_paths_failed`]: Self::all_paths_failed
 	PaymentPathFailed {
 		/// The id returned by [`ChannelManager::send_payment`] and used with
-		/// [`ChannelManager::retry_payment`] and [`ChannelManager::no_further_payment_retries`].
+		/// [`ChannelManager::retry_payment`] and [`ChannelManager::abandon_payment`].
 		///
 		/// [`ChannelManager::send_payment`]: crate::ln::channelmanager::ChannelManager::send_payment
 		/// [`ChannelManager::retry_payment`]: crate::ln::channelmanager::ChannelManager::retry_payment
-		/// [`ChannelManager::no_further_payment_retries`]: crate::ln::channelmanager::ChannelManager::no_further_payment_retries
+		/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
 		payment_id: Option<PaymentId>,
 		/// The hash that was given to [`ChannelManager::send_payment`].
 		///
@@ -269,12 +269,11 @@ pub enum Event {
 		/// has an associated in-flight HTLC. See (1) for an example of such a failure.
 		///
 		/// If you wish to retry individual MPP parts and learn when a payment has failed, you must
-		/// call [`ChannelManager::no_further_payment_retries`] and wait for a [`Event::PaymentFailed`]
-		/// event.
+		/// call [`ChannelManager::abandon_payment`] and wait for a [`Event::PaymentFailed`] event.
 		///
 		/// (1) <https://github.com/lightningdevkit/rust-lightning/issues/1164>
 		///
-		/// [`ChannelManager::no_further_payment_retries`]: crate::ln::channelmanager::ChannelManager::no_further_payment_retries
+		/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
 		all_paths_failed: bool,
 		/// The payment path that failed.
 		path: Vec<RouteHop>,
@@ -300,17 +299,16 @@ pub enum Event {
 	///
 	/// This event is provided once there are no further pending HTLCs for the payment and the
 	/// payment is no longer retryable, either due to a several-block timeout or because
-	/// [`ChannelManager::no_further_payment_retries`] was previously called for the corresponding
-	/// payment.
+	/// [`ChannelManager::abandon_payment`] was previously called for the corresponding payment.
 	///
-	/// [`ChannelManager::no_further_payment_retries`]: crate::ln::channelmanager::ChannelManager::no_further_payment_retries
+	/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
 	PaymentFailed {
 		/// The id returned by [`ChannelManager::send_payment`] and used with
-		/// [`ChannelManager::retry_payment`] and [`ChannelManager::no_further_payment_retries`].
+		/// [`ChannelManager::retry_payment`] and [`ChannelManager::abandon_payment`].
 		///
 		/// [`ChannelManager::send_payment`]: crate::ln::channelmanager::ChannelManager::send_payment
 		/// [`ChannelManager::retry_payment`]: crate::ln::channelmanager::ChannelManager::retry_payment
-		/// [`ChannelManager::no_further_payment_retries`]: crate::ln::channelmanager::ChannelManager::no_further_payment_retries
+		/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
 		payment_id: PaymentId,
 		/// The hash that was given to [`ChannelManager::send_payment`].
 		///