f

Author: TheBlueMatt

lightning/src/ln/peer_handler.rs

@@ -1153,9 +1153,15 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 						macro_rules! insert_node_id {
 							() => {
 								match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap().0) {
-									hash_map::Entry::Occupied(_) => {
+									hash_map::Entry::Occupied(e) => {
 										log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap().0));
 										peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
+										#[cfg(debug_assertions)] {
+											// Check that the peers map is consistent with the
+											// node_id_to_descriptor map, as this has been broken
+											// before.
+											peers.get(e.get()).unwrap();
+										}
 										return Err(PeerHandleError { })
 									},
 									hash_map::Entry::Vacant(entry) => {