f use fields, not tuple, and reduce indentation

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -5473,38 +5473,46 @@ where
 								}
 							}
 							UpdateFulfillCommitFetch::DuplicateClaim {} => {
-								if let Some(action) = completion_action(None, true) {
-									log_trace!(self.logger, "Completing monitor update completion action for channel {} as claim was redundant: {:?}",
-										chan_id, action);
-									mem::drop(peer_state_lock);
-									if let MonitorUpdateCompletionAction::FreeOtherChannelImmediately {
-										downstream_counterparty_and_funding_outpoint
-									} = action {
-										let (node_id, funding_outpoint, blocker) =
-											downstream_counterparty_and_funding_outpoint;
-										if let Some(peer_state_mtx) = per_peer_state.get(&node_id) {
-											let mut peer_state = peer_state_mtx.lock().unwrap();
-											if let Some(blockers) = peer_state.actions_blocking_raa_monitor_updates
-												.get_mut(&funding_outpoint.to_channel_id())
-											{
-												let mut found_blocker = false;
-												blockers.retain(|iter| {
-													// Note that we could actually be blocked, in
-													// which case we need to only remove the one
-													// blocker which was added duplicatively.
-													let first_blocker = !found_blocker;
-													if *iter == blocker { found_blocker = true; }
-													*iter != blocker || !first_blocker
-												});
-												debug_assert!(found_blocker);
-											}
-										} else {
-											debug_assert!(false);
-										}
-									} else {
-										debug_assert!(false,
-											"Duplicate claims should always free another channel immediately");
+								let action = if let Some(action) = completion_action(None, true) {
+									action
+								} else {
+									return Ok(());
+								};
+								mem::drop(peer_state_lock);
+
+								log_trace!(self.logger, "Completing monitor update completion action for channel {} as claim was redundant: {:?}",
+									chan_id, action);
+								let (node_id, funding_outpoint, blocker) =
+								if let MonitorUpdateCompletionAction::FreeOtherChannelImmediately {
+									downstream_counterparty_node_id: node_id,
+									downstream_funding_outpoint: funding_outpoint,
+									blocking_action: blocker,
+								} = action {
+									(node_id, funding_outpoint, blocker)
+								} else {
+									debug_assert!(false,
+										"Duplicate claims should always free another channel immediately");
+									return Ok(());
+								};
+								if let Some(peer_state_mtx) = per_peer_state.get(&node_id) {
+									let mut peer_state = peer_state_mtx.lock().unwrap();
+									if let Some(blockers) = peer_state
+										.actions_blocking_raa_monitor_updates
+										.get_mut(&funding_outpoint.to_channel_id())
+									{
+										let mut found_blocker = false;
+										blockers.retain(|iter| {
+											// Note that we could actually be blocked, in
+											// which case we need to only remove the one
+											// blocker which was added duplicatively.
+											let first_blocker = !found_blocker;
+											if *iter == blocker { found_blocker = true; }
+											*iter != blocker || !first_blocker
+										});
+										debug_assert!(found_blocker);
 									}
+								} else {
+									debug_assert!(false);
 								}
 							}
 						}