f reorder code blocks to improve legibility

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -3650,13 +3650,14 @@ impl<Signer: Sign> Channel<Signer> {
 
 		self.update_time_counter = cmp::max(self.update_time_counter, highest_header_time);
 
+		if let Some(funding_locked) = self.check_get_funding_locked(height) {
+			return Ok((Some(funding_locked), timed_out_htlcs));
+		}
+
 		if self.funding_tx_confirmation_height > 0 {
 			let funding_tx_confirmations = height as i64 - self.funding_tx_confirmation_height as i64 + 1;
-			if funding_tx_confirmations <= 0 {
-				self.funding_tx_confirmation_height = 0;
-			}
-
 			let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
+
 			if (non_shutdown_state >= ChannelState::ChannelFunded as u32 ||
 			   (non_shutdown_state & ChannelState::OurFundingLocked as u32) == ChannelState::OurFundingLocked as u32) &&
 			    funding_tx_confirmations < self.minimum_depth as i64 / 2 {
@@ -3665,10 +3666,6 @@ impl<Signer: Sign> Channel<Signer> {
 					data: format!("Funding transaction was un-confirmed. Locked at {} confs, now have {} confs.", self.minimum_depth, funding_tx_confirmations),
 				});
 			}
-
-			if let Some(funding_locked) = self.check_get_funding_locked(height) {
-				return Ok((Some(funding_locked), timed_out_htlcs));
-			}
 		}
 
 		Ok((None, timed_out_htlcs))