f - more expect

Author: jkczyz

lightning/src/ln/channel.rs

@@ -9280,9 +9280,11 @@ where
 
 					let funding_promoted =
 						self.maybe_promote_splice_funding(confirmed_funding_index, logger);
-					let funding_txo = funding_promoted
-						.then(|| self.funding.get_funding_txo())
-						.flatten();
+					let funding_txo = funding_promoted.then(|| {
+						self.funding
+							.get_funding_txo()
+							.expect("Splice FundingScope should always have a funding_txo")
+					});
 					let announcement_sigs = funding_promoted
 						.then(|| self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger))
 						.flatten();
@@ -9447,9 +9449,11 @@ where
 
 				let funding_promoted =
 					self.maybe_promote_splice_funding(confirmed_funding_index, logger);
-				let funding_txo = funding_promoted
-					.then(|| self.funding.get_funding_txo())
-					.flatten();
+				let funding_txo = funding_promoted.then(|| {
+					self.funding
+						.get_funding_txo()
+						.expect("Splice FundingScope should always have a funding_txo")
+				});
 				let announcement_sigs = funding_promoted
 					.then(|| chain_node_signer
 						.and_then(|(chain_hash, node_signer, user_config)|