f - avoid accessing FundingScope from ChannelManager

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1805,11 +1805,6 @@ impl FundingScope {
 	pub fn get_channel_type(&self) -> &ChannelTypeFeatures {
 		&self.channel_transaction_parameters.channel_type_features
 	}
-
-	/// Returns the block hash in which our funding transaction was confirmed.
-	pub fn get_funding_tx_confirmed_in(&self) -> Option<BlockHash> {
-		self.funding_tx_confirmed_in
-	}
 }
 
 /// Info about a pending splice, used in the pre-splice channel
@@ -9463,6 +9458,11 @@ impl<SP: Deref> FundedChannel<SP> where
 	pub fn is_v2_established(&self) -> bool {
 		self.is_v2_established
 	}
+
+	/// Returns the block hash in which our funding transaction was confirmed.
+	pub fn get_funding_tx_confirmed_in(&self) -> Option<BlockHash> {
+		self.funding.funding_tx_confirmed_in
+	}
 }
 
 /// A not-yet-funded outbound (from holder) channel using V1 channel establishment.

lightning/src/ln/channelmanager.rs

@@ -11639,7 +11639,7 @@ where
 			for chan in peer_state.channel_by_id.values().filter_map(Channel::as_funded) {
 				let txid_opt = chan.funding.get_funding_txo();
 				let height_opt = chan.context.get_funding_tx_confirmation_height();
-				let hash_opt = chan.funding.get_funding_tx_confirmed_in();
+				let hash_opt = chan.get_funding_tx_confirmed_in();
 				if let (Some(funding_txo), Some(conf_height), Some(block_hash)) = (txid_opt, height_opt, hash_opt) {
 					res.push((funding_txo.txid, conf_height, Some(block_hash)));
 				}