f use failed_within_blinded_path instead and add debug_assert

Author: valentinewallace

lightning/src/ln/outbound_payment.rs

@@ -17,7 +17,7 @@ use crate::sign::{EntropySource, NodeSigner, Recipient};
 use crate::events::{self, PaymentFailureReason};
 use crate::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
 use crate::ln::channelmanager::{ChannelDetails, EventCompletionAction, HTLCSource, PaymentId};
-use crate::ln::onion_utils::{DecodedOnionFailure, HTLCFailReason, INVALID_ONION_BLINDING};
+use crate::ln::onion_utils::{DecodedOnionFailure, HTLCFailReason};
 use crate::offers::invoice::Bolt12Invoice;
 use crate::routing::router::{BlindedTail, InFlightHtlcs, Path, PaymentParameters, Route, RouteParameters, Router};
 use crate::util::errors::APIError;
@@ -1653,11 +1653,11 @@ impl OutboundPayments {
 				// next-hop is needlessly blaming us!
 				payment.get_mut().insert_previously_failed_scid(scid);
 			}
-			if onion_error_code == Some(INVALID_ONION_BLINDING) {
+			if failed_within_blinded_path {
 				debug_assert!(short_channel_id.is_none());
 				if let Some(bt) = &path.blinded_tail {
 					payment.get_mut().insert_previously_failed_blinded_path(&bt);
-				}
+				} else { debug_assert!(false); }
 			}
 
 			if payment_is_probe || !is_retryable_now || payment_failed_permanently {