Abstract params to make claim mon completion action

We'll be adding another parameter to this closure soon. Also this makes it a
little clearer what's going on at the callsites.

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -3615,6 +3615,20 @@ impl TrustedChannelFeatures {
 	}
 }
 
+struct ClaimCompletionActionParams {
+	definitely_duplicate: bool,
+	inbound_htlc_value_msat: Option<u64>,
+}
+
+impl ClaimCompletionActionParams {
+	fn new_claim(inbound_htlc_value_msat: u64) -> Self {
+		Self { definitely_duplicate: false, inbound_htlc_value_msat: Some(inbound_htlc_value_msat) }
+	}
+	fn duplicate_claim() -> Self {
+		Self { definitely_duplicate: true, inbound_htlc_value_msat: None }
+	}
+}
+
 impl<
 		M: chain::Watch<SP::EcdsaSigner>,
 		T: BroadcasterInterface,
@@ -9545,9 +9559,9 @@ impl<
 					payment_info.clone(),
 					Some(attribution_data),
 					None,
-					|_, definitely_duplicate| {
+					|claim_action_params| {
 						debug_assert!(
-							!definitely_duplicate,
+							!claim_action_params.definitely_duplicate,
 							"We shouldn't claim duplicatively from a payment"
 						);
 						(
@@ -9619,7 +9633,9 @@ impl<
 			Some(attribution_data),
 			monitor_event_id
 				.map(|event_id| MonitorEventSource { event_id, channel_id: next_channel_id }),
-			|htlc_claim_value_msat, definitely_duplicate| {
+			|claim_completion_action_params| {
+				let ClaimCompletionActionParams { definitely_duplicate, inbound_htlc_value_msat } =
+					claim_completion_action_params;
 				let chan_to_release = EventUnblockedChannel {
 					counterparty_node_id: next_channel_counterparty_node_id,
 					funding_txo: next_channel_outpoint,
@@ -9689,7 +9705,7 @@ impl<
 						None,
 					)
 				} else {
-					let event = make_payment_forwarded_event(htlc_claim_value_msat);
+					let event = make_payment_forwarded_event(inbound_htlc_value_msat);
 					(
 						Some(MonitorUpdateCompletionAction::EmitEventOptionAndFreeOtherChannel {
 							event: event.map(|ev| ev.into()),
@@ -9704,8 +9720,7 @@ impl<
 
 	fn claim_funds_from_hop<
 		ComplFunc: FnOnce(
-			Option<u64>,
-			bool,
+			ClaimCompletionActionParams,
 		) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
 	>(
 		&self, prev_hop: HTLCPreviousHopData, payment_preimage: PaymentPreimage,
@@ -9743,8 +9758,7 @@ impl<
 
 	fn claim_mpp_part<
 		ComplFunc: FnOnce(
-			Option<u64>,
-			bool,
+			ClaimCompletionActionParams,
 		) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
 	>(
 		&self, prev_hop: HTLCClaimSource, payment_preimage: PaymentPreimage,
@@ -9792,8 +9806,9 @@ impl<
 
 					match fulfill_res {
 						UpdateFulfillCommitFetch::NewClaim { htlc_value_msat, monitor_update } => {
-							let (action_opt, raa_blocker_opt) =
-								completion_action(Some(htlc_value_msat), false);
+							let (action_opt, raa_blocker_opt) = completion_action(
+								ClaimCompletionActionParams::new_claim(htlc_value_msat),
+							);
 							if let Some(action) = action_opt {
 								log_trace!(
 									logger,
@@ -9828,7 +9843,9 @@ impl<
 							}
 						},
 						UpdateFulfillCommitFetch::DuplicateClaim {} => {
-							let (action_opt, raa_blocker_opt) = completion_action(None, true);
+							let (action_opt, raa_blocker_opt) =
+								completion_action(ClaimCompletionActionParams::duplicate_claim());
+
 							if let Some(raa_blocker) = raa_blocker_opt {
 								// If we're making a claim during startup, its a replay of a
 								// payment claim from a `ChannelMonitor`. In some cases (MPP or
@@ -9956,7 +9973,10 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 		// `ChannelMonitorUpdate` we're about to generate. This may result in a duplicate `Event`,
 		// but note that `Event`s are generally always allowed to be duplicative (and it's
 		// specifically noted in `PaymentForwarded`).
-		let (action_opt, raa_blocker_opt) = completion_action(None, false);
+		let (action_opt, raa_blocker_opt) = completion_action(ClaimCompletionActionParams {
+			definitely_duplicate: false,
+			inbound_htlc_value_msat: None,
+		});
 
 		if let Some(raa_blocker) = raa_blocker_opt {
 			peer_state
@@ -20470,7 +20490,7 @@ impl<
 								None,
 								None,
 								None,
-								|_, _| {
+								|_| {
 									(
 										Some(MonitorUpdateCompletionAction::PaymentClaimed {
 											payment_hash,