X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Foutbound_payment.rs;h=a4d5c3a389e4e476dabcfb735aeed05f106e84ce;hb=5f5119fa3dd151276052827ea0b02fa20cf926e7;hp=5ea772e5d4ffbfb0b82c9fc19e014781e3219aa0;hpb=51d5eada2153a3a5cf96191726d1a3c9eb4d6f44;p=rust-lightning

diff --git a/lightning/src/ln/outbound_payment.rs b/lightning/src/ln/outbound_payment.rs
index 5ea772e5..a4d5c3a3 100644
--- a/lightning/src/ln/outbound_payment.rs
+++ b/lightning/src/ln/outbound_payment.rs
@@ -1484,10 +1484,11 @@ impl OutboundPayments {
 	) -> bool where L::Target: Logger {
 		#[cfg(test)]
 		let DecodedOnionFailure {
-			network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data
+			network_update, short_channel_id, payment_failed_permanently, onion_error_code,
+			onion_error_data
 		} = onion_error.decode_onion_failure(secp_ctx, logger, &source);
 		#[cfg(not(test))]
-		let DecodedOnionFailure { network_update, short_channel_id, payment_retryable } =
+		let DecodedOnionFailure { network_update, short_channel_id, payment_failed_permanently } =
 			onion_error.decode_onion_failure(secp_ctx, logger, &source);
 
 		let payment_is_probe = payment_is_probe(payment_hash, &payment_id, probing_cookie_secret);
@@ -1528,8 +1529,8 @@ impl OutboundPayments {
 				payment.get_mut().insert_previously_failed_scid(scid);
 			}
 
-			if payment_is_probe || !is_retryable_now || !payment_retryable {
-				let reason = if !payment_retryable {
+			if payment_is_probe || !is_retryable_now || payment_failed_permanently {
+				let reason = if payment_failed_permanently {
 					PaymentFailureReason::RecipientRejected
 				} else {
 					PaymentFailureReason::RetriesExhausted
@@ -1559,7 +1560,7 @@ impl OutboundPayments {
 
 		let path_failure = {
 			if payment_is_probe {
-				if !payment_retryable {
+				if payment_failed_permanently {
 					events::Event::ProbeSuccessful {
 						payment_id: *payment_id,
 						payment_hash: payment_hash.clone(),
@@ -1583,7 +1584,7 @@ impl OutboundPayments {
 				events::Event::PaymentPathFailed {
 					payment_id: Some(*payment_id),
 					payment_hash: payment_hash.clone(),
-					payment_failed_permanently: !payment_retryable,
+					payment_failed_permanently,
 					failure: events::PathFailure::OnPath { network_update },
 					path: path.clone(),
 					short_channel_id,