fail_htlc: PaymentCompleteUpdate -> EventComplAction

Generalize fail_htlc's completion-action parameter from PaymentCompleteUpdate
to EventCompletionAction so the upcoming persistent-monitor-events path can
pass AckMonitorEvent.

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -9377,7 +9377,7 @@ impl<
 	fn fail_htlc_backwards_internal(
 		&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason,
 		failure_type: HTLCHandlingFailureType,
-		mut from_monitor_update_completion: Option<PaymentCompleteUpdate>,
+		mut from_monitor_update_completion: Option<EventCompletionAction>,
 	) {
 		// Ensure that no peer state channel storage lock is held when calling this function.
 		// This ensures that future code doesn't introduce a lock-order requirement for
@@ -9431,16 +9431,14 @@ impl<
 					&mut from_monitor_update_completion,
 					&logger,
 				);
-				if let Some(update) = from_monitor_update_completion {
+				if let Some(action) = from_monitor_update_completion {
 					// If `fail_htlc` didn't `take` the post-event action, we should go ahead and
 					// complete it here as the failure was duplicative - we've already handled it.
 					// This can happen in rare cases where a MonitorUpdate is replayed after
 					// restart because a ChannelMonitor wasn't persisted after it was applied (even
 					// though the ChannelManager was).
 					// For such cases, we also check that there's no existing pending event to
 					// complete this action already, which we let finish instead.
-					let action =
-						EventCompletionAction::ReleasePaymentCompleteChannelMonitorUpdate(update);
 					let have_action = {
 						let pending_events = self.pending_events.lock().unwrap();
 						pending_events.iter().any(|(_, act)| act.as_ref() == Some(&action))
@@ -13978,12 +13976,12 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 									let failure_type = htlc_update
 										.source
 										.failure_type(counterparty_node_id, channel_id);
-									let completion_update = Some(PaymentCompleteUpdate {
+									let completion_update = Some(EventCompletionAction::ReleasePaymentCompleteChannelMonitorUpdate(PaymentCompleteUpdate {
 										counterparty_node_id,
 										channel_funding_outpoint: funding_outpoint,
 										channel_id,
 										htlc_id: SentHTLCId::from_source(&htlc_update.source),
-									});
+									}));
 									self.fail_htlc_backwards_internal(
 										&htlc_update.source,
 										&htlc_update.payment_hash,
@@ -20173,12 +20171,16 @@ impl<
 							"Failing HTLC with payment hash {} as it was resolved on-chain.",
 							payment_hash
 						);
-						let completion_action = Some(PaymentCompleteUpdate {
-							counterparty_node_id: monitor.get_counterparty_node_id(),
-							channel_funding_outpoint: monitor.get_funding_txo(),
-							channel_id: monitor.channel_id(),
-							htlc_id: SentHTLCId::from_source(&htlc_source),
-						});
+						let completion_action = Some(
+							EventCompletionAction::ReleasePaymentCompleteChannelMonitorUpdate(
+								PaymentCompleteUpdate {
+									counterparty_node_id: monitor.get_counterparty_node_id(),
+									channel_funding_outpoint: monitor.get_funding_txo(),
+									channel_id: monitor.channel_id(),
+									htlc_id: SentHTLCId::from_source(&htlc_source),
+								},
+							),
+						);
 
 						failed_htlcs.push((
 							htlc_source,

lightning/src/ln/outbound_payment.rs

@@ -18,8 +18,7 @@ use crate::blinded_path::{IntroductionNode, NodeIdLookUp};
 use crate::events::{self, PaidBolt12Invoice, PaymentFailureReason};
 use crate::ln::channel_state::ChannelDetails;
 use crate::ln::channelmanager::{
-	EventCompletionAction, HTLCSource, OptionalBolt11PaymentParams, PaymentCompleteUpdate,
-	PaymentId,
+	EventCompletionAction, HTLCSource, OptionalBolt11PaymentParams, PaymentId,
 };
 use crate::ln::msgs::DecodeError;
 use crate::ln::onion_utils;
@@ -2426,7 +2425,7 @@ impl OutboundPayments {
 		path: &Path, session_priv: &SecretKey, payment_id: &PaymentId,
 		probing_cookie_secret: [u8; 32], secp_ctx: &Secp256k1<secp256k1::All>,
 		pending_events: &Mutex<VecDeque<(events::Event, Option<EventCompletionAction>)>>,
-		completion_action: &mut Option<PaymentCompleteUpdate>, logger: &WithContext<L>,
+		completion_action: &mut Option<EventCompletionAction>, logger: &WithContext<L>,
 	) {
 		#[cfg(any(test, feature = "_test_utils"))]
 		let DecodedOnionFailure {
@@ -2574,9 +2573,7 @@ impl OutboundPayments {
 			}
 		};
 		let mut pending_events = pending_events.lock().unwrap();
-		let completion_action = completion_action
-			.take()
-			.map(|act| EventCompletionAction::ReleasePaymentCompleteChannelMonitorUpdate(act));
+		let completion_action = completion_action.take();
 		if let Some(ev) = full_failure_ev {
 			pending_events.push_back((path_failure, None));
 			pending_events.push_back((ev, completion_action));