f - Merge FailedAlongPath into RetriesExhausted

lightning/src/events/mod.rs

@@ -275,15 +275,14 @@ impl_writeable_tlv_based_enum!(InterceptNextHop,
 pub enum PaymentFailureReason {
 	/// The intended recipient rejected our payment.
 	RecipientRejected,
-	/// The payment failed while being forwarded along the path. A [`Event::PaymentPathFailed`]
-	/// should have come before this.
-	FailedAlongPath,
 	/// The user chose to abandon this payment by calling [`ChannelManager::abandon_payment`].
 	///
 	/// [`ChannelManager::abandon_payment`]: crate::ln::channelmanager::ChannelManager::abandon_payment
 	UserAbandoned,
 	/// We exhausted all of our retry attempts while trying to send the payment, or we
-	/// exhausted the `Retry::Timeout` if the user set one.
+	/// exhausted the `Retry::Timeout` if the user set one. If at any point the reason a retry
+	/// attempt failed while being forwarded along the path, a [`Event::PaymentPathFailed`] will
+	/// have come before this.
 	RetriesExhausted,
 	/// The payment expired while retrying. If the user chooses to include an `expiry_time` in their
 	/// `PaymentParams` this payment will be failed if it is retried after this time has elapsed.
@@ -297,12 +296,11 @@ pub enum PaymentFailureReason {
 
 impl_writeable_tlv_based_enum_upgradable!(PaymentFailureReason,
 	(0, RecipientRejected) => {},
-	(2, FailedAlongPath) => {},
-	(4, UserAbandoned) => {},
-	(6, RetriesExhausted) => {},
-	(8, PaymentExpired) => {},
-	(10, RouteNotFound) => {},
-	(12, UnexpectedError) => {},
+	(2, UserAbandoned) => {},
+	(4, RetriesExhausted) => {},
+	(6, PaymentExpired) => {},
+	(8, RouteNotFound) => {},
+	(10, UnexpectedError) => {},
 );
 
 /// An Event which you should probably take some action in response to.