f Always return channel_id, if we have it

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -3489,7 +3489,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 													match channel_state.by_id.entry(*chan_id) {
 														hash_map::Entry::Occupied(prev_chan) =>
 															(Some(chan_id.clone()), Some(prev_chan.get().get_user_id())),
-														_ => (None, None),
+														_ => (Some(chan_id.clone()), None),
 													}
 												} else {
 													(None, None)
@@ -3546,7 +3546,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 																match channel_state.by_id.entry(*chan_id) {
 																	hash_map::Entry::Occupied(prev_chan) =>
 																		(Some(chan_id.clone()), Some(prev_chan.get().get_user_id())),
-																	_ => (None, None),
+																	_ => (Some(chan_id.clone()), None),
 																}
 															} else {
 																(None, None)