f move push_payment_path_failed_evs and add debug asserts

Author: valentinewallace

lightning/src/ln/outbound_payment.rs

@@ -675,11 +675,11 @@ impl OutboundPayments {
 	{
 		match err {
 			PaymentSendFailure::AllFailedResendSafe(errs) => {
-				push_payment_path_failed_evs(payment_id, payment_hash, route.paths, errs.into_iter().map(|e| Err(e)), pending_events);
+				Self::push_payment_path_failed_evs(payment_id, payment_hash, route.paths, errs.into_iter().map(|e| Err(e)), pending_events);
 				self.retry_payment_internal(payment_id, payment_hash, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);
 			},
 			PaymentSendFailure::PartialFailure { failed_paths_retry: Some(retry), results, .. } => {
-				push_payment_path_failed_evs(payment_id, payment_hash, route.paths, results.into_iter(), pending_events);
+				Self::push_payment_path_failed_evs(payment_id, payment_hash, route.paths, results.into_iter(), pending_events);
 				// 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.
@@ -691,14 +691,41 @@ impl OutboundPayments {
 				// initial HTLC-Add messages yet.
 			},
 			PaymentSendFailure::PathParameterError(results) => {
-				push_payment_path_failed_evs(payment_id, payment_hash, route.paths, results.into_iter(), pending_events);
+				Self::push_payment_path_failed_evs(payment_id, payment_hash, route.paths, results.into_iter(), pending_events);
 				self.abandon_payment(payment_id, pending_events);
 			},
 			PaymentSendFailure::ParameterError(e) => {
 				log_error!(logger, "Failed to send to route due to parameter error: {:?}. Your router is buggy", e);
 				self.abandon_payment(payment_id, pending_events);
 			},
-			PaymentSendFailure::DuplicatePayment => {}, // unreachable
+			PaymentSendFailure::DuplicatePayment => debug_assert!(false), // unreachable
+		}
+	}
+
+	fn push_payment_path_failed_evs<I: ExactSizeIterator + Iterator<Item = Result<(), APIError>>>(
+		payment_id: PaymentId, payment_hash: PaymentHash, paths: Vec<Vec<RouteHop>>, path_results: I,
+		pending_events: &Mutex<Vec<events::Event>>
+	) {
+		let mut events = pending_events.lock().unwrap();
+		debug_assert_eq!(paths.len(), path_results.len());
+		for (path, path_res) in paths.into_iter().zip(path_results) {
+			if path_res.is_err() {
+				let scid = path[0].short_channel_id;
+				events.push(events::Event::PaymentPathFailed {
+					payment_id: Some(payment_id),
+					payment_hash,
+					payment_failed_permanently: false,
+					network_update: None,
+					all_paths_failed: false,
+					path,
+					short_channel_id: Some(scid),
+					retry: None,
+					#[cfg(test)]
+					error_code: None,
+					#[cfg(test)]
+					error_data: None,
+				});
+			}
 		}
 	}
 
@@ -1275,32 +1302,6 @@ impl OutboundPayments {
 	}
 }
 
-fn push_payment_path_failed_evs<I: Iterator<Item = Result<(), APIError>>>(
-	payment_id: PaymentId, payment_hash: PaymentHash, paths: Vec<Vec<RouteHop>>, path_results: I,
-	pending_events: &Mutex<Vec<events::Event>>
-) {
-	let mut events = pending_events.lock().unwrap();
-	for (path, path_res) in paths.into_iter().zip(path_results) {
-		if path_res.is_err() {
-			let scid = path[0].short_channel_id;
-			events.push(events::Event::PaymentPathFailed {
-				payment_id: Some(payment_id),
-				payment_hash,
-				payment_failed_permanently: false,
-				network_update: None,
-				all_paths_failed: false,
-				path,
-				short_channel_id: Some(scid),
-				retry: None,
-				#[cfg(test)]
-				error_code: None,
-				#[cfg(test)]
-				error_data: None,
-			});
-		}
-	}
-}
-
 /// Returns whether a payment with the given [`PaymentHash`] and [`PaymentId`] is, in fact, a
 /// payment probe.
 pub(super) fn payment_is_probe(payment_hash: &PaymentHash, payment_id: &PaymentId,