From: Matt Corallo <git@bluematt.me>
Date: Tue, 7 Dec 2021 01:56:31 +0000 (+0000)
Subject: Swap loop and condition order to avoid looping unnecessarily
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=d981413b27cadefdfd45b0396925396ace102710;p=rust-lightning

Swap loop and condition order to avoid looping unnecessarily
---

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 98eb984fa..e437d57aa 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -4367,8 +4367,8 @@ impl<Signer: Sign> Channel<Signer> {
 		txdata: &TransactionData, genesis_block_hash: BlockHash, node_pk: PublicKey, logger: &L)
 	-> Result<(Option<msgs::FundingLocked>, Option<msgs::AnnouncementSignatures>), ClosureReason> where L::Target: Logger {
 		let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
-		for &(index_in_block, tx) in txdata.iter() {
-			if let Some(funding_txo) = self.get_funding_txo() {
+		if let Some(funding_txo) = self.get_funding_txo() {
+			for &(index_in_block, tx) in txdata.iter() {
 				// If we haven't yet sent a funding_locked, but are in FundingSent (ignoring
 				// whether they've sent a funding_locked or not), check if we should send one.
 				if non_shutdown_state & !(ChannelState::TheirFundingLocked as u32) == ChannelState::FundingSent as u32 {