f - use temporary_channel_id in unset_funding_info

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1403,9 +1403,11 @@ impl<SP: Deref> Channel<SP> where
 		result.map(|monitor| (self.as_funded_mut().expect("Channel should be funded"), monitor))
 	}
 
-	pub fn unset_funding_info(&mut self, temporary_channel_id: ChannelId) {
+	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);
 
 			let context = funded_chan.context;

lightning/src/ln/channelmanager.rs

@@ -8179,7 +8179,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 						// updates should be made on it. Previously, full_stack_target
 						// found an (unreachable) panic when the monitor update contained
 						// within `shutdown_finish` was applied.
-						chan.unset_funding_info(msg.channel_id);
+						chan.unset_funding_info();
 						try_channel_entry!(self, peer_state, Err(e), chan_entry)
 					},
 				}

lightning/src/ln/functional_tests.rs

@@ -9072,7 +9072,7 @@ fn test_duplicate_conflicting_funding_from_second_peer() {
 	check_added_monitors!(nodes[0], 1);
 	get_err_msg(&nodes[0], &nodes[1].node.get_our_node_id());
 	let err_reason = ClosureReason::ProcessingError { err: "Channel funding outpoint was a duplicate".to_owned() };
-	check_closed_events(&nodes[0], &[ExpectedCloseEvent::from_id_reason(funding_signed_msg.channel_id, true, err_reason)]);
+	check_closed_events(&nodes[0], &[ExpectedCloseEvent::from_id_reason(temp_chan_id, true, err_reason)]);
 }
 
 #[test]