f store and if let instead of directly if let'ing

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -1377,11 +1377,12 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 
 		let mut confirmed_txid = us.funding_spend_confirmed;
 		let mut pending_commitment_tx_conf_thresh = None;
-		if let Some((txid, conf_thresh)) = us.onchain_events_awaiting_threshold_conf.iter().find_map(|event| {
+		let funding_spend_pending = us.onchain_events_awaiting_threshold_conf.iter().find_map(|event| {
 			if let OnchainEvent::FundingSpendConfirmation { .. } = event.event {
 				Some((event.txid, event.confirmation_threshold()))
 			} else { None }
-		}) {
+		});
+		if let Some((txid, conf_thresh)) = funding_spend_pending {
 			debug_assert!(us.funding_spend_confirmed.is_none(),
 				"We have a pending funding spend awaiting anti-reorg confirmation, we can't have confirmed it already!");
 			confirmed_txid = Some(txid);
@@ -1398,11 +1399,12 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 							// If the payment was outbound, check if there's an HTLCUpdate
 							// indicating we have spent this HTLC with a timeout, claiming it back
 							// and awaiting confirmations on it.
-							if let Some(conf_thresh) = us.onchain_events_awaiting_threshold_conf.iter().find_map(|event| {
+							let htlc_update_pending = us.onchain_events_awaiting_threshold_conf.iter().find_map(|event| {
 								if let OnchainEvent::HTLCUpdate { input_idx: Some(input_idx), .. } = event.event {
 									if input_idx == htlc_input_idx { Some(event.confirmation_threshold()) } else { None }
 								} else { None }
-							}) {
+							});
+							if let Some(conf_thresh) = htlc_update_pending {
 								res.push(ClaimableBalance::ClaimableAwaitingConfirmations {
 									claimable_amount_satoshis: htlc.amount_msat / 1000,
 									confirmation_height: conf_thresh,
@@ -1419,15 +1421,14 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 							// Note that if there is a pending claim, but it did not use the
 							// preimage, we lost funds to our counterparty! We will then continue
 							// to show it as ContentiousClaimable until ANTI_REORG_DELAY.
-							if let Some((conf_thresh, true)) =
-								us.onchain_events_awaiting_threshold_conf.iter().find_map(|event| {
-									if let OnchainEvent::HTLCSpendConfirmation { input_idx, preimage, .. } = event.event {
-										if input_idx == htlc_input_idx {
-											Some((event.confirmation_threshold(), preimage.is_some()))
-										} else { None }
+							let htlc_spend_pending = us.onchain_events_awaiting_threshold_conf.iter().find_map(|event| {
+								if let OnchainEvent::HTLCSpendConfirmation { input_idx, preimage, .. } = event.event {
+									if input_idx == htlc_input_idx {
+										Some((event.confirmation_threshold(), preimage.is_some()))
 									} else { None }
-								}
-							) {
+								} else { None }
+							});
+							if let Some((conf_thresh, true)) = htlc_spend_pending {
 								res.push(ClaimableBalance::ClaimableAwaitingConfirmations {
 									claimable_amount_satoshis: htlc.amount_msat / 1000,
 									confirmation_height: conf_thresh,