f - address FIXMEs

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1782,18 +1782,17 @@ where
 					.take()
 					.expect("PendingV2Channel::interactive_tx_constructor should be set")
 					.into_signing_session();
-				let result = chan.context.funding_tx_constructed(
+				let (commitment_signed, event) = chan.context.funding_tx_constructed(
 					&mut chan.funding,
 					&mut signing_session,
 					false,
 					chan.unfunded_context.transaction_number(),
 					&&logger,
-				);
+				)?;
 
-				// FIXME: Should this remain None if result is an Err?
 				chan.interactive_tx_signing_session = Some(signing_session);
 
-				return result;
+				return Ok((commitment_signed, event));
 			},
 			#[cfg(splicing)]
 			ChannelPhase::Funded(chan) => {
@@ -1806,20 +1805,19 @@ where
 						{
 							let mut signing_session =
 								interactive_tx_constructor.into_signing_session();
-							let result = chan.context.funding_tx_constructed(
+							let (commitment_signed, event) = chan.context.funding_tx_constructed(
 								&mut funding,
 								&mut signing_session,
 								true,
 								chan.holder_commitment_point.transaction_number(),
 								&&logger,
-							);
+							)?;
 
-							// FIXME: Should these remain None if result is an Err?
 							chan.interactive_tx_signing_session = Some(signing_session);
 							pending_splice.funding_negotiation =
 								Some(FundingNegotiation::AwaitingSignatures(funding));
 
-							return result;
+							return Ok((commitment_signed, event));
 						} else {
 							// Replace the taken state
 							pending_splice.funding_negotiation = Some(funding_negotiation);