-f use helpers

Author: Antoine Riard

lightning/src/ln/channel.rs

@@ -2954,17 +2954,16 @@ impl<Signer: Sign> Channel<Signer> {
 		}
 
 		// Before to propose a feerate update, check that we can actually afford the new fee compare to the holder balance.
-		let num_htlcs = self.pending_inbound_htlcs.len() + self.pending_outbound_htlcs.len();
-		let total_fee = feerate_per_kw as u64 * (COMMITMENT_TX_BASE_WEIGHT + (num_htlcs as u64) * COMMITMENT_TX_WEIGHT_PER_HTLC) / 1000;
+		let inbound_stats = self.get_inbound_pending_htlc_stats(Some(feerate_per_kw));
+		let outbound_stats = self.get_outbound_pending_htlc_stats(Some(feerate_per_kw));
+		let total_fee = feerate_per_kw as u64 * (COMMITMENT_TX_BASE_WEIGHT + (inbound_stats.pending_htlcs as u64 + outbound_stats.pending_htlcs as u64) * COMMITMENT_TX_WEIGHT_PER_HTLC) / 1000;
 		if self.value_to_self_msat / 1000 - total_fee < self.counterparty_selected_channel_reserve_satoshis.unwrap() {
 			log_debug!(logger, "Cannot afford to send new feerate at {}", feerate_per_kw);
 			return None;
 		}
 
 		if feerate_per_kw > self.get_dust_buffer_feerate(None) {
 			// Note, we evaluate pending htlc "preemptive" trimmed-to-dust threshold at the proposed `feerate_per_kw`.
-			let inbound_stats = self.get_inbound_pending_htlc_stats(Some(feerate_per_kw));
-			let outbound_stats = self.get_outbound_pending_htlc_stats(Some(feerate_per_kw));
 			let holder_tx_dust_exposure = inbound_stats.on_holder_tx_dust_exposure_msat + outbound_stats.on_holder_tx_dust_exposure_msat;
 			let counterparty_tx_dust_exposure = inbound_stats.on_counterparty_tx_dust_exposure_msat + outbound_stats.on_counterparty_tx_dust_exposure_msat;
 			if holder_tx_dust_exposure > self.get_max_dust_htlc_exposure_msat() {