f Improve legibility somewhat with a new variable, as arik suggested

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -3563,10 +3563,11 @@ impl<Signer: Sign> Channel<Signer> {
 	/// back.
 	pub fn update_best_block(&mut self, height: u32, highest_header_time: u32) -> Result<(Option<msgs::FundingLocked>, Vec<(HTLCSource, PaymentHash)>), msgs::ErrorMessage> {
 		let mut timed_out_htlcs = Vec::new();
+		let unforwarded_htlc_cltv_limit = height + HTLC_FAIL_BACK_BUFFER;
 		self.holding_cell_htlc_updates.retain(|htlc_update| {
 			match htlc_update {
 				&HTLCUpdateAwaitingACK::AddHTLC { ref payment_hash, ref source, ref cltv_expiry, .. } => {
-					if *cltv_expiry <= height + HTLC_FAIL_BACK_BUFFER {
+					if *cltv_expiry <= unforwarded_htlc_cltv_limit {
 						timed_out_htlcs.push((source.clone(), payment_hash.clone()));
 						false
 					} else { true }