fmt and clippy

Author: diegomrsantos

misc/peer-store/src/connection_store.rs

@@ -1,6 +1,6 @@
-use std::collections::{HashMap, HashSet};
 use libp2p_core::{ConnectedPoint, PeerId};
 use libp2p_swarm::ConnectionId;
+use std::collections::{HashMap, HashSet};
 
 /// Events emitted by the connection tracker behaviour.
 #[derive(Debug, Clone)]
@@ -41,7 +41,7 @@ impl ConnectionStore {
         peer_id: &PeerId,
         connection_id: &ConnectionId,
     ) -> bool {
-        let connections = self.connected.entry(*peer_id).or_insert_with(HashSet::new);
+        let connections = self.connected.entry(*peer_id).or_default();
         let is_first_connection = connections.is_empty();
         connections.insert(*connection_id);
         is_first_connection
@@ -55,11 +55,11 @@ impl ConnectionStore {
         connection_id: &ConnectionId,
         remaining_established: &usize,
     ) -> bool {
-        if let Some(connections) = self.connected.get_mut(&peer_id) {
-            connections.remove(&connection_id);
+        if let Some(connections) = self.connected.get_mut(peer_id) {
+            connections.remove(connection_id);
 
             if *remaining_established == 0 {
-                self.connected.remove(&peer_id);
+                self.connected.remove(peer_id);
                 return true;
             }
         }
@@ -88,4 +88,4 @@ impl ConnectionStore {
             .map(|connections| connections.len())
             .unwrap_or(0)
     }
-}
+}

misc/peer-store/src/lib.rs

@@ -18,9 +18,9 @@
 //! or provide information to PeerStore.
 
 mod behaviour;
+pub mod connection_store;
 pub mod memory_store;
 mod store;
-pub mod connection_store;
 
 pub use behaviour::Behaviour;
 pub use store::Store;

misc/peer-store/src/memory_store.rs

@@ -8,18 +8,17 @@
 //! let behaviour = Behaviour::new(store);
 //! ```
 
+use super::Store;
+use crate::connection_store::ConnectionStore;
+use libp2p_core::{Multiaddr, PeerId};
+use libp2p_swarm::{behaviour::ConnectionEstablished, ConnectionClosed, DialError, FromSwarm};
+use lru::LruCache;
 use std::{
     collections::{HashMap, VecDeque},
     num::NonZeroUsize,
     task::{Poll, Waker},
 };
-use std::collections::HashSet;
-use libp2p_core::{Multiaddr, PeerId};
-use libp2p_swarm::{behaviour::ConnectionEstablished, ConnectionClosed, ConnectionId, DialError, FromSwarm};
-use lru::LruCache;
 use tracing::{debug, trace};
-use crate::connection_store::ConnectionStore;
-use super::{connection_store, Store};
 
 /// Event emitted from the [`MemoryStore`] to the [`Swarm`](libp2p_swarm::Swarm).
 #[derive(Debug, Clone)]
@@ -222,12 +221,12 @@ impl<T> Store for MemoryStore<T> {
                 self.add_address_inner(&info.peer_id, info.addr, false);
             }
             FromSwarm::ConnectionEstablished(ConnectionEstablished {
-                peer_id, 
+                peer_id,
                 connection_id,
                 failed_addresses,
                 endpoint,
                 ..
-            })  => {
+            }) => {
                 if endpoint.is_dialer() {
                     if self.config.remove_addr_on_dial_error {
                         for failed_addr in *failed_addresses {
@@ -239,7 +238,9 @@ impl<T> Store for MemoryStore<T> {
 
                 trace!(%peer_id, ?connection_id, "Connection established");
 
-                let is_first_connection = self.connection_store.connection_established(peer_id, connection_id);
+                let is_first_connection = self
+                    .connection_store
+                    .connection_established(peer_id, connection_id);
 
                 if is_first_connection {
                     debug!(?peer_id, "Peer connected");
@@ -251,16 +252,18 @@ impl<T> Store for MemoryStore<T> {
                 }
             }
             FromSwarm::ConnectionClosed(ConnectionClosed {
-                                            peer_id,
-                                            connection_id,
-                                            remaining_established,
-                                            ..
-                                        }) => {
+                peer_id,
+                connection_id,
+                remaining_established,
+                ..
+            }) => {
                 trace!(%peer_id, ?connection_id, remaining_established, "Connection closed");
 
-                let is_last_connection =
-                    self.connection_store
-                        .connection_closed(peer_id, connection_id, remaining_established);
+                let is_last_connection = self.connection_store.connection_closed(
+                    peer_id,
+                    connection_id,
+                    remaining_established,
+                );
 
                 if is_last_connection {
                     debug!(%peer_id, "Peer disconnected");