Replace insert_node_id macro with a lambda

Author: TheBlueMatt

lightning/src/ln/peer_handler.rs

@@ -916,21 +916,20 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 					if peer.pending_read_buffer_pos == peer.pending_read_buffer.len() {
 						peer.pending_read_buffer_pos = 0;
 
-						macro_rules! insert_node_id {
-							() => {
-								match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap()) {
-									hash_map::Entry::Occupied(_) => {
-										log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
-										peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
-										return Err(PeerHandleError{ no_connection_possible: false })
-									},
-									hash_map::Entry::Vacant(entry) => {
-										log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
-										entry.insert(peer_descriptor.clone())
-									},
-								};
+						let insert_node_id = || {
+							match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap()) {
+								hash_map::Entry::Occupied(_) => {
+									log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
+									peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
+									Err(PeerHandleError{ no_connection_possible: false })
+								},
+								hash_map::Entry::Vacant(entry) => {
+									log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
+									entry.insert(peer_descriptor.clone());
+									Ok(())
+								},
 							}
-						}
+						};
 
 						let next_step = peer.channel_encryptor.get_noise_step();
 						match next_step {
@@ -948,7 +947,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 								peer.pending_read_is_header = true;
 
 								peer.their_node_id = Some(their_node_id);
-								insert_node_id!();
+								insert_node_id()?;
 								let features = InitFeatures::known();
 								let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 								self.enqueue_message(peer, &resp);
@@ -960,7 +959,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 								peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 								peer.pending_read_is_header = true;
 								peer.their_node_id = Some(their_node_id);
-								insert_node_id!();
+								insert_node_id()?;
 								let features = InitFeatures::known();
 								let resp = msgs::Init { features, remote_network_address: filter_addresses(peer.their_net_address.clone()) };
 								self.enqueue_message(peer, &resp);