f oopsd

Author: TheBlueMatt

lightning/src/chain/package.rs

@@ -113,13 +113,14 @@ const LOW_FREQUENCY_BUMP_INTERVAL: u32 = 15;
 pub(crate) const LOW_FREQUENCY_BUMP_INTERVAL: u32 = 15;
 
 /// Height delay at which transactions are fee-bumped/rebroadcasted with a middle priority.
-#[cfg(not(test))]
 const MIDDLE_FREQUENCY_BUMP_INTERVAL: u32 = 3;
-/// Height delay at which transactions are fee-bumped/rebroadcasted with a middle priority.
-#[cfg(test)]
-pub(crate) 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.
@@ -963,10 +964,10 @@ impl PackageTemplate {
 	pub(crate) fn get_height_timer(&self, current_height: u32) -> u32 {
 		let mut height_timer = current_height + LOW_FREQUENCY_BUMP_INTERVAL;
 		let timer_for_target_conf = |target_conf| -> u32 {
-			if target_conf <= current_height + LOW_FREQUENCY_BUMP_INTERVAL {
-				current_height + MIDDLE_FREQUENCY_BUMP_INTERVAL
-			} else if target_conf <= current_height + MIDDLE_FREQUENCY_BUMP_INTERVAL {
+			if target_conf <= current_height + MIDDLE_FREQUENCY_BUMP_INTERVAL {
 				current_height + HIGH_FREQUENCY_BUMP_INTERVAL
+			} else if target_conf <= current_height + LOW_FREQUENCY_BUMP_INTERVAL {
+				current_height + MIDDLE_FREQUENCY_BUMP_INTERVAL
 			} else {
 				current_height + LOW_FREQUENCY_BUMP_INTERVAL
 			}

lightning/src/ln/functional_tests.rs

@@ -17,7 +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, MIDDLE_FREQUENCY_BUMP_INTERVAL};
+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};
@@ -7550,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], MIDDLE_FREQUENCY_BUMP_INTERVAL);
+	connect_blocks(&nodes[1], HIGH_FREQUENCY_BUMP_INTERVAL);
 	let penalty_3;
 	let mut feerate_3 = 0;
 	{