Swap loop and condition order to avoid looping unnecessarily
authorMatt Corallo <git@bluematt.me>
Tue, 7 Dec 2021 01:56:31 +0000 (01:56 +0000)
committerMatt Corallo <git@bluematt.me>
Wed, 26 Jan 2022 18:20:26 +0000 (18:20 +0000)
lightning/src/ln/channel.rs

index e20bfc87cbcae087ad0168d5d18a0fbdcd5bc0bf..f385bf256bf0bb9248df26e9c697983caabbc47b 100644 (file)
@@ -4419,8 +4419,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 {