f clear funding_outpoint at callsite of get_initial_commitment_signed upon error

Author: dunxen

lightning/src/ln/channel.rs

@@ -1761,7 +1761,10 @@ pub(super) trait InteractivelyFunded<SP: Deref> where SP::Target: SignerProvider
 				context.funding_transaction = Some(signing_session.unsigned_tx.clone().into_unsigned_tx());
 				commitment_signed
 			},
-			Err(err) => return Err(ChannelError::Close((err.to_string(), ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) }))),
+			Err(err) => {
+				context.channel_transaction_parameters.funding_outpoint = None;
+				return Err(ChannelError::Close((err.to_string(), ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) })))
+			},
 		};
 
 		let funding_ready_for_sig_event = None;
@@ -4008,7 +4011,6 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			Ok(res) => res,
 			Err(e) => {
 				log_error!(logger, "Got bad signatures: {:?}!", e);
-				self.channel_transaction_parameters.funding_outpoint = None;
 				return Err(e);
 			}
 		};