f - remove temporary_channel_id parameter

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1406,9 +1406,7 @@ impl<SP: Deref> Channel<SP> where
 	pub fn unset_funding_info(&mut self) {
 		let phase = core::mem::replace(&mut self.phase, ChannelPhase::Undefined);
 		if let ChannelPhase::Funded(mut funded_chan) = phase {
-			let temporary_channel_id = funded_chan.context.temporary_channel_id
-				.unwrap_or(funded_chan.context.channel_id);
-			funded_chan.unset_funding_info(temporary_channel_id);
+			funded_chan.unset_funding_info();
 
 			let context = funded_chan.context;
 			let unfunded_context = UnfundedChannelContext {
@@ -5001,12 +4999,13 @@ impl<SP: Deref> FundedChannel<SP> where
 	///
 	/// Further, the channel must be immediately shut down after this with a call to
 	/// [`ChannelContext::force_shutdown`].
-	pub fn unset_funding_info(&mut self, temporary_channel_id: ChannelId) {
+	pub fn unset_funding_info(&mut self) {
 		debug_assert!(matches!(
 			self.context.channel_state, ChannelState::AwaitingChannelReady(_)
 		));
 		self.context.channel_transaction_parameters.funding_outpoint = None;
-		self.context.channel_id = temporary_channel_id;
+		self.context.channel_id = self.context.temporary_channel_id
+			.unwrap_or(self.context.channel_id);
 	}
 
 	/// Handles a channel_ready message from our peer. If we've already sent our channel_ready

lightning/src/ln/channelmanager.rs

@@ -8096,7 +8096,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 			// `locked_close_channel`), we'll remove the existing channel from `outpoint_to_peer`.
 			// Thus, we must first unset the funding outpoint on the channel.
 			let err = ChannelError::close($err.to_owned());
-			chan.unset_funding_info(msg.temporary_channel_id);
+			chan.unset_funding_info();
 			return Err(convert_channel_err!(self, peer_state, err, chan.context, &funded_channel_id, UNFUNDED_CHANNEL).1);
 		} } }