Also set user_channel_id when its overridden

tnull · tnull · commit 52a74693b5df · 2022-11-16T15:32:33.000+01:00
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
@@ -4639,7 +4639,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 					}
 					channel_state.pending_msg_events.push(events::MessageSendEvent::SendAcceptChannel {
 						node_id: counterparty_node_id.clone(),
-						msg: channel.accept_inbound_channel(0),
+						msg: channel.accept_inbound_channel(user_channel_id),
 					});
 				} else {
 					let mut pending_events = self.pending_events.lock().unwrap();

Original file line number	Diff line number	Diff line change
`@@ -4639,7 +4639,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F`
`4639`	`4639`	`}`
`4640`	`4640`	`channel_state.pending_msg_events.push(events::MessageSendEvent::SendAcceptChannel {`
`4641`	`4641`	`node_id: counterparty_node_id.clone(),`
`4642`		`- msg: channel.accept_inbound_channel(0),`
	`4642`	`+ msg: channel.accept_inbound_channel(user_channel_id),`
`4643`	`4643`	`});`
`4644`	`4644`	`} else {`
`4645`	`4645`	`let mut pending_events = self.pending_events.lock().unwrap();`