f one match on pay error and fix buggy increment

Author: valentinewallace

lightning/src/ln/outbound_payment.rs

@@ -486,34 +486,38 @@ impl OutboundPayments {
 
 		let res = self.retry_payment_with_route(&route, payment_id, entropy_source, node_signer, best_block_height, send_payment_along_path);
 		match res {
-			Err(PaymentSendFailure::AllFailedResendSafe(_)) | Err(PaymentSendFailure::PartialFailure { .. }) => {
+			Err(PaymentSendFailure::AllFailedResendSafe(_)) => {
 				let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 				if let Some(payment) = outbounds.get_mut(&payment_id) {
 					let retryable = payment.is_retryable_now();
 					if retryable {
 						payment.increment_attempts();
 					} else { return res }
 				} else { return res }
-			}
-			res => return res
-		}
-		match res {
-			Err(PaymentSendFailure::AllFailedResendSafe(_)) => {
+				core::mem::drop(outbounds);
 				self.pay_internal(payment_id, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, send_payment_along_path)
 			},
-			Err(PaymentSendFailure::PartialFailure { failed_paths_retry, .. }) => {
-				if let Some(retry) = failed_paths_retry {
-					// Some paths were sent, even if we failed to send the full MPP value our recipient may
-					// misbehave and claim the funds, at which point we have to consider the payment sent, so
-					// return `Ok()` here, ignoring any retry errors.
-					let _ = self.pay_internal(payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, send_payment_along_path);
-					Ok(())
-				} else {
-					// This may happen if we send a payment and some paths fail, but only due to a temporary
-					// monitor failure or the like, implying they're really in-flight, but we haven't sent the
-					// initial HTLC-Add messages yet.
-					Ok(())
-				}
+			Err(PaymentSendFailure::PartialFailure { failed_paths_retry: Some(retry), results, .. }) => {
+				let mut outbounds = self.pending_outbound_payments.lock().unwrap();
+				if let Some(payment) = outbounds.get_mut(&payment_id) {
+					let retryable = payment.is_retryable_now();
+					if retryable {
+						payment.increment_attempts();
+					} else { return Err(PaymentSendFailure::PartialFailure { failed_paths_retry: Some(retry), results, payment_id }) }
+				} else { return Err(PaymentSendFailure::PartialFailure { failed_paths_retry: Some(retry), results, payment_id }) }
+				core::mem::drop(outbounds);
+
+				// Some paths were sent, even if we failed to send the full MPP value our recipient may
+				// misbehave and claim the funds, at which point we have to consider the payment sent, so
+				// return `Ok()` here, ignoring any retry errors.
+				let _ = self.pay_internal(payment_id, retry, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, send_payment_along_path);
+				Ok(())
+			},
+			Err(PaymentSendFailure::PartialFailure { failed_paths_retry: None, .. }) => {
+				// This may happen if we send a payment and some paths fail, but only due to a temporary
+				// monitor failure or the like, implying they're really in-flight, but we haven't sent the
+				// initial HTLC-Add messages yet.
+				Ok(())
 			},
 			res => res,
 		}