f - expect

Author: jkczyz

lightning/src/ln/channel.rs

@@ -2188,7 +2188,6 @@ impl PendingSplice {
 			},
 		}
 	}
-
 }
 
 /// Wrapper around a [`Transaction`] useful for caching the result of [`Transaction::compute_txid`].
@@ -9986,15 +9985,18 @@ where
 						&self.context.channel_id,
 					);
 					promote_splice_funding!(self, funding);
-					let funding_txo = self.funding.get_funding_txo();
+					let funding_txo = self
+						.funding
+						.get_funding_txo()
+						.expect("Splice FundingScope should always have a funding_txo");
 					let announcement_sigs = self.get_announcement_sigs(
 						node_signer,
 						chain_hash,
 						user_config,
 						best_block.height,
 						logger,
 					);
-					return Ok((funding_txo, announcement_sigs));
+					return Ok((Some(funding_txo), announcement_sigs));
 				}
 
 				let err = "unknown splice funding txid";