Clean up

beacon_node/lighthouse_network/src/discovery/mod.rs

@@ -32,6 +32,7 @@ pub use libp2p::{
 };
 use logging::crit;
 use lru::LruCache;
+use network_utils::discovery_metrics;
 use ssz::Encode;
 use std::num::NonZeroUsize;
 use std::{
@@ -45,7 +46,6 @@ use std::{
 };
 use tokio::sync::mpsc;
 use tracing::{debug, error, info, trace, warn};
-use network_utils::discovery_metrics;
 use types::{ChainSpec, EnrForkId, EthSpec};
 
 mod subnet_predicate;
@@ -687,7 +687,10 @@ impl<E: EthSpec> Discovery<E> {
                 min_ttl,
                 retries,
             });
-            metrics::set_gauge(&discovery_metrics::DISCOVERY_QUEUE, self.queued_queries.len() as i64);
+            metrics::set_gauge(
+                &discovery_metrics::DISCOVERY_QUEUE,
+                self.queued_queries.len() as i64,
+            );
         }
     }
 
@@ -722,7 +725,10 @@ impl<E: EthSpec> Discovery<E> {
             }
         }
         // Update the queue metric
-        metrics::set_gauge(&discovery_metrics::DISCOVERY_QUEUE, self.queued_queries.len() as i64);
+        metrics::set_gauge(
+            &discovery_metrics::DISCOVERY_QUEUE,
+            self.queued_queries.len() as i64,
+        );
         processed
     }
 

beacon_node/lighthouse_network/src/peer_manager/mod.rs

@@ -24,6 +24,7 @@ pub mod peerdb;
 
 use crate::peer_manager::peerdb::client::ClientKind;
 use libp2p::multiaddr;
+use network_utils::discovery_metrics;
 use network_utils::enr_ext::{peer_id_to_node_id, EnrExt};
 pub use peerdb::peer_info::{
     ConnectionDirection, PeerConnectionStatus, PeerConnectionStatus::*, PeerInfo,
@@ -33,7 +34,6 @@ pub use peerdb::sync_status::{SyncInfo, SyncStatus};
 use std::collections::{hash_map::Entry, HashMap, HashSet};
 use std::net::IpAddr;
 use strum::IntoEnumIterator;
-use network_utils::discovery_metrics;
 use types::data_column_custody_group::{
     compute_subnets_from_custody_group, get_custody_groups, CustodyIndex,
 };