f - differenitate between RecipientRejected and FailedAlongPath

Author: alecchendev

lightning/src/ln/functional_test_utils.rs

@@ -1923,7 +1923,11 @@ pub fn expect_payment_failed_conditions_event<'a, 'b, 'c, 'd, 'e>(
 			Event::PaymentFailed { ref payment_hash, ref payment_id, ref reason } => {
 				assert_eq!(*payment_hash, expected_payment_hash, "unexpected second payment_hash");
 				assert_eq!(*payment_id, expected_payment_id);
-				assert_eq!(reason.unwrap(), PaymentFailureReason::RecipientRejected);
+				assert_eq!(reason.unwrap(), if expected_payment_failed_permanently {
+					PaymentFailureReason::RecipientRejected
+				} else {
+					PaymentFailureReason::FailedAlongPath
+				});
 			}
 			_ => panic!("Unexpected second event"),
 		}

lightning/src/ln/onion_route_tests.rs

@@ -215,7 +215,11 @@ fn run_onion_failure_test_with_fail_intercept<F1,F2,F3>(_name: &str, test_case:
 		Event::PaymentFailed { payment_hash: ev_payment_hash, payment_id: ev_payment_id, reason: ref ev_reason } => {
 			assert_eq!(*payment_hash, ev_payment_hash);
 			assert_eq!(payment_id, ev_payment_id);
-			assert_eq!(PaymentFailureReason::RecipientRejected, ev_reason.unwrap());
+			assert_eq!(if expected_retryable {
+				PaymentFailureReason::FailedAlongPath
+			} else {
+				PaymentFailureReason::RecipientRejected
+			}, ev_reason.unwrap());
 		}
 		_ => panic!("Unexpected second event"),
 	}

lightning/src/ln/outbound_payment.rs

@@ -1178,7 +1178,11 @@ impl OutboundPayments {
 						full_failure_ev = Some(events::Event::PaymentFailed {
 							payment_id: *payment_id,
 							payment_hash: payment.get().payment_hash().expect("PendingOutboundPayments::RetriesExceeded always has a payment hash set"),
-							reason: Some(PaymentFailureReason::RecipientRejected),
+							reason: Some(if payment_retryable {
+									PaymentFailureReason::FailedAlongPath
+								} else {
+									PaymentFailureReason::RecipientRejected
+							}),
 						});
 					}
 					payment.remove();

lightning/src/ln/payment_tests.rs

@@ -2438,7 +2438,7 @@ fn no_extra_retries_on_back_to_back_fail() {
 		Event::PaymentFailed { payment_hash: ref ev_payment_hash, payment_id: ref ev_payment_id, reason: ref ev_reason } => {
 			assert_eq!(payment_hash, *ev_payment_hash);
 			assert_eq!(PaymentId(payment_hash.0), *ev_payment_id);
-			assert_eq!(PaymentFailureReason::RecipientRejected, ev_reason.unwrap());
+			assert_eq!(PaymentFailureReason::FailedAlongPath, ev_reason.unwrap());
 		},
 		_ => panic!("Unexpected event"),
 	}