Always remove_path_inflight_htlcs when receiving PaymentPathFailed

Author: jurvis

lightning-invoice/src/payment.rs

@@ -756,23 +756,20 @@ where
 					self.scorer.lock().payment_path_failed(&path, *short_channel_id);
 				}
 
+				self.remove_path_inflight_htlcs(*payment_hash, path);
 				if payment_id.is_none() {
 					log_trace!(self.logger, "Payment {} has no id; not retrying", log_bytes!(payment_hash.0));
-					self.remove_path_inflight_htlcs(*payment_hash, path);
 				} else if *rejected_by_dest {
 					log_trace!(self.logger, "Payment {} rejected by destination; not retrying", log_bytes!(payment_hash.0));
 					self.payer.abandon_payment(payment_id.unwrap());
-					self.remove_path_inflight_htlcs(*payment_hash, path);
 				} else if retry.is_none() {
 					log_trace!(self.logger, "Payment {} missing retry params; not retrying", log_bytes!(payment_hash.0));
 					self.payer.abandon_payment(payment_id.unwrap());
-					self.remove_path_inflight_htlcs(*payment_hash, path);
 				} else if self.retry_payment(payment_id.unwrap(), *payment_hash, retry.as_ref().unwrap()).is_ok() {
 					// We retried at least somewhat, don't provide the PaymentPathFailed event to the user.
 					return;
 				} else {
 					self.payer.abandon_payment(payment_id.unwrap());
-					self.remove_path_inflight_htlcs(*payment_hash, path);
 				}
 			},
 			Event::PaymentFailed { payment_hash, .. } => {