f - Add id_to_peer map, remove unnecessary variables

Author: ViktorTigerstrom

lightning/src/ln/channelmanager.rs

@@ -2777,18 +2777,16 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 			node_id: chan.get_counterparty_node_id(),
 			msg,
 		});
-		let chan_id = chan.channel_id();
-		match channel_state.by_id.entry(chan_id) {
+		match channel_state.by_id.entry(chan.channel_id()) {
 			hash_map::Entry::Occupied(_) => {
 				panic!("Generated duplicate funding txid?");
 			},
 			hash_map::Entry::Vacant(e) => {
-				let counterparty_node_id = chan.get_counterparty_node_id();
-				e.insert(chan);
 				let mut id_to_peer = self.id_to_peer.lock().unwrap();
-				if id_to_peer.insert(chan_id, counterparty_node_id).is_some() {
+				if id_to_peer.insert(chan.channel_id(), chan.get_counterparty_node_id()).is_some() {
 					panic!("id_to_peer map already contained funding txid, which shouldn't be possible");
 				}
+				e.insert(chan);
 			}
 		}
 		Ok(())
@@ -4435,12 +4433,15 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 		}
 		let mut channel_state_lock = self.channel_state.lock().unwrap();
 		let channel_state = &mut *channel_state_lock;
-		let channel_id = funding_msg.channel_id;
-		match channel_state.by_id.entry(channel_id) {
+		match channel_state.by_id.entry(funding_msg.channel_id) {
 			hash_map::Entry::Occupied(_) => {
-				return Err(MsgHandleErrInternal::send_err_msg_no_close("Already had channel with the new channel_id".to_owned(), channel_id))
+				return Err(MsgHandleErrInternal::send_err_msg_no_close("Already had channel with the new channel_id".to_owned(), funding_msg.channel_id))
 			},
 			hash_map::Entry::Vacant(e) => {
+				let mut id_to_peer = self.id_to_peer.lock().unwrap();
+				if id_to_peer.insert(funding_msg.channel_id, *counterparty_node_id).is_some() {
+					panic!("id_to_peer map already contained funding txid, which shouldn't be possible");
+				}
 				channel_state.pending_msg_events.push(events::MessageSendEvent::SendFundingSigned {
 					node_id: counterparty_node_id.clone(),
 					msg: funding_msg,
@@ -4449,10 +4450,6 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					send_channel_ready!(channel_state.short_to_chan_info, channel_state.pending_msg_events, chan, msg);
 				}
 				e.insert(chan);
-				let mut id_to_peer = self.id_to_peer.lock().unwrap();
-				if id_to_peer.insert(channel_id, *counterparty_node_id).is_some() {
-					panic!("id_to_peer map already contained funding txid, which shouldn't be possible");
-				}
 			}
 		}
 		Ok(())