Correct RBF bump rate calculation

Dating back to its introduction in
757bcc2, `get_height_timer` has
never used the `MIDDLE_FREQUENCY_BUMP_INTERVAL` (then not even a
constant) as its if tree was in the wrong order.

This fixes that.

Author: TheBlueMatt

lightning/src/chain/package.rs

@@ -114,8 +114,13 @@ pub(crate) const LOW_FREQUENCY_BUMP_INTERVAL: u32 = 15;
 
 /// Height delay at which transactions are fee-bumped/rebroadcasted with a middle priority.
 const MIDDLE_FREQUENCY_BUMP_INTERVAL: u32 = 3;
+
 /// Height delay at which transactions are fee-bumped/rebroadcasted with a high priority.
+#[cfg(not(test))]
 const HIGH_FREQUENCY_BUMP_INTERVAL: u32 = 1;
+/// Height delay at which transactions are fee-bumped/rebroadcasted with a high priority.
+#[cfg(test)]
+pub(crate) const HIGH_FREQUENCY_BUMP_INTERVAL: u32 = 1;
 
 /// A struct to describe a revoked output and corresponding information to generate a solving
 /// witness spending a commitment `to_local` output or a second-stage HTLC transaction output.

lightning/src/ln/functional_tests.rs

@@ -17,6 +17,7 @@ use crate::chain::chaininterface::LowerBoundedFeeEstimator;
 use crate::chain::channelmonitor;
 use crate::chain::channelmonitor::{CLOSED_CHANNEL_UPDATE_ID, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
 use crate::chain::transaction::OutPoint;
+use crate::chain::package::{LOW_FREQUENCY_BUMP_INTERVAL, HIGH_FREQUENCY_BUMP_INTERVAL};
 use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, OutputSpender, SignerProvider};
 use crate::events::{Event, FundingInfo, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, ClosureReason, HTLCDestination, PaymentFailureReason};
 use crate::ln::types::{ChannelId, PaymentPreimage, PaymentSecret, PaymentHash};
@@ -7526,7 +7527,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {
 	};
 
 	// After exhaustion of height timer, a new bumped justice tx should have been broadcast, check it
-	connect_blocks(&nodes[1], 15);
+	connect_blocks(&nodes[1], LOW_FREQUENCY_BUMP_INTERVAL);
 	let mut penalty_2 = penalty_1;
 	let mut feerate_2 = 0;
 	{
@@ -7549,7 +7550,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {
 	assert_ne!(feerate_2, 0);
 
 	// After exhaustion of height timer for a 2nd time, a new bumped justice tx should have been broadcast, check it
-	connect_blocks(&nodes[1], 1);
+	connect_blocks(&nodes[1], HIGH_FREQUENCY_BUMP_INTERVAL);
 	let penalty_3;
 	let mut feerate_3 = 0;
 	{