Move check_funding_meets_minimum_depth to FundedChannel

This method is only applicable for FundedChannel, so it shouldn't be
accessible from ChannelContext.

Author: jkczyz

lightning/src/ln/channel.rs

@@ -5499,30 +5499,6 @@ where
 		self.get_initial_counterparty_commitment_signature(funding, logger)
 	}
 
-	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
-		let minimum_depth = funding
-			.minimum_depth_override
-			.or(self.minimum_depth)
-			.expect("ChannelContext::minimum_depth should be set for FundedChannel");
-
-		// Zero-conf channels always meet the minimum depth.
-		if minimum_depth == 0 {
-			return true;
-		}
-
-		if funding.funding_tx_confirmation_height == 0 {
-			return false;
-		}
-
-		let funding_tx_confirmations =
-			height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
-		if funding_tx_confirmations < minimum_depth as i64 {
-			return false;
-		}
-
-		return true;
-	}
-
 	#[rustfmt::skip]
 	fn check_for_funding_tx_confirmed(
 		&mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
@@ -8905,7 +8881,7 @@ where
 		// Called:
 		//  * always when a new block/transactions are confirmed with the new height
 		//  * when funding is signed with a height of 0
-		if !self.context.check_funding_meets_minimum_depth(&self.funding, height) {
+		if !self.check_funding_meets_minimum_depth(&self.funding, height) {
 			return None;
 		}
 
@@ -8979,7 +8955,7 @@ where
 	fn check_get_splice_locked(
 		&self, pending_splice: &PendingSplice, funding: &FundingScope, height: u32,
 	) -> Option<msgs::SpliceLocked> {
-		if !self.context.check_funding_meets_minimum_depth(funding, height) {
+		if !self.check_funding_meets_minimum_depth(funding, height) {
 			return None;
 		}
 
@@ -9000,6 +8976,30 @@ where
 		}
 	}
 
+	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
+		let minimum_depth = funding
+			.minimum_depth_override
+			.or(self.context.minimum_depth)
+			.expect("ChannelContext::minimum_depth should be set for FundedChannel");
+
+		// Zero-conf channels always meet the minimum depth.
+		if minimum_depth == 0 {
+			return true;
+		}
+
+		if funding.funding_tx_confirmation_height == 0 {
+			return false;
+		}
+
+		let funding_tx_confirmations =
+			height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
+		if funding_tx_confirmations < minimum_depth as i64 {
+			return false;
+		}
+
+		return true;
+	}
+
 	#[cfg(splicing)]
 	fn maybe_promote_splice_funding<L: Deref>(
 		&mut self, splice_txid: Txid, confirmed_funding_index: usize, logger: &L,