Clean up handle_monitor_update_completion_actions after rustfmt
What the developer wrote
Authored by Joost Jager
Clean up handle_monitor_update_completion_actions after rustfmt
What changed, and why it matters
This commit is a pure code cleanup and formatting follow-up after rustfmt was run. It renames a local variable from counterparty_node_id to cp_node_id and flattens deeply nested if-let blocks into a more readable match/early-return style. There is no functional change to the program's behavior.
No security action needed. Treat as normal maintenance/refactoring commit.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The diff refactors handle_monitor_update_completion_actions in lightning/src/ln/channelmanager.rs. It replaces nested if-let patterns with a flat match and early returns, shortens variable names, and removes unnecessary braces. The logic for handling RAAMonitorUpdateBlockingAction::ClaimedMPPPayment remains identical: it still retains the matching blocker, moves the current channel from channels_without_preimage to channels_with_preimage, pushes freed channels when no preimage-less channels remain, and removes the blockers entry when empty.
Changed components
lightning/src/ln/channelmanager.rsInspect captured patch +25 / −42
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index ea6409d..cd0adaa 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -9465,58 +9465,41 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
WithContext::from(&self.logger, peer_id, chan_id, Some(payment_hash));
log_trace!(logger, "Handling PaymentClaimed monitor update completion action");
- if let Some((counterparty_node_id, chan_id, claim_ptr)) = pending_mpp_claim {
+ if let Some((cp_node_id, chan_id, claim_ptr)) = pending_mpp_claim {
let per_peer_state = self.per_peer_state.read().unwrap();
- per_peer_state.get(&counterparty_node_id).map(|peer_state_mutex| {
+ per_peer_state.get(&cp_node_id).map(|peer_state_mutex| {
let mut peer_state = peer_state_mutex.lock().unwrap();
let blockers_entry =
peer_state.actions_blocking_raa_monitor_updates.entry(chan_id);
if let btree_map::Entry::Occupied(mut blockers) = blockers_entry {
blockers.get_mut().retain(|blocker| {
- if let &RAAMonitorUpdateBlockingAction::ClaimedMPPPayment {
- pending_claim,
- } = &blocker
- {
- if *pending_claim == claim_ptr {
- let mut pending_claim_state_lock =
- pending_claim.0.lock().unwrap();
- let pending_claim_state =
- &mut *pending_claim_state_lock;
- pending_claim_state.channels_without_preimage.retain(
- |(cp, cid)| {
- let this_claim = *cp == counterparty_node_id
- && *cid == chan_id;
- if this_claim {
- pending_claim_state
- .channels_with_preimage
- .push((*cp, *cid));
- false
- } else {
- true
- }
- },
- );
- if pending_claim_state
- .channels_without_preimage
- .is_empty()
- {
- for (cp, cid) in pending_claim_state
- .channels_with_preimage
- .iter()
- {
- let freed_chan = (*cp, *cid, blocker.clone());
- freed_channels.push(freed_chan);
- }
- }
- !pending_claim_state
- .channels_without_preimage
- .is_empty()
+ let pending_claim = match &blocker {
+ RAAMonitorUpdateBlockingAction::ClaimedMPPPayment {
+ pending_claim,
+ } => pending_claim,
+ _ => return true,
+ };
+ if *pending_claim != claim_ptr {
+ return true;
+ }
+ let mut claim_state_lock = pending_claim.0.lock().unwrap();
+ let claim_state = &mut *claim_state_lock;
+ claim_state.channels_without_preimage.retain(|(cp, cid)| {
+ let this_claim = *cp == cp_node_id && *cid == chan_id;
+ if this_claim {
+ claim_state.channels_with_preimage.push((*cp, *cid));
+ false
} else {
true
}
- } else {
- true
+ });
+ if claim_state.channels_without_preimage.is_empty() {
+ for (cp, cid) in claim_state.channels_with_preimage.iter() {
+ let freed_chan = (*cp, *cid, blocker.clone());
+ freed_channels.push(freed_chan);
+ }
}
+ !claim_state.channels_without_preimage.is_empty()
});
if blockers.get().is_empty() {
blockers.remove();
Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.