feat: remove Bandwidthmeter type (#8698)

Co-authored-by: Matthias Seitz <[email protected]>

crates/net/common/Cargo.toml

@@ -16,5 +16,4 @@ workspace = true
 alloy-primitives.workspace = true
 
 # async
-pin-project.workspace = true
 tokio = { workspace = true, features = ["full"] }

crates/net/common/src/lib.rs

@@ -9,7 +9,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 pub mod ban_list;
-pub mod bandwidth_meter;
 
 /// Traits related to tokio streams
 pub mod stream;

crates/net/network/src/manager.rs

@@ -42,7 +42,6 @@ use reth_eth_wire::{
     DisconnectReason, EthVersion, Status,
 };
 use reth_metrics::common::mpsc::UnboundedMeteredSender;
-use reth_net_common::bandwidth_meter::BandwidthMeter;
 use reth_network_api::ReputationChangeKind;
 use reth_network_peers::PeerId;
 use reth_primitives::{ForkId, NodeRecord};
@@ -141,12 +140,6 @@ impl<C> NetworkManager<C> {
         &self.handle
     }
 
-    /// Returns a shareable reference to the [`BandwidthMeter`] stored
-    /// inside of the [`NetworkHandle`]
-    pub fn bandwidth_meter(&self) -> &BandwidthMeter {
-        self.handle.bandwidth_meter()
-    }
-
     /// Returns the secret key used for authenticating sessions.
     pub const fn secret_key(&self) -> SecretKey {
         self.swarm.sessions().secret_key()
@@ -233,7 +226,6 @@ where
         let discv4 = discovery.discv4();
 
         let num_active_peers = Arc::new(AtomicUsize::new(0));
-        let bandwidth_meter: BandwidthMeter = BandwidthMeter::default();
 
         let sessions = SessionManager::new(
             secret_key,
@@ -243,7 +235,6 @@ where
             hello_message,
             fork_filter,
             extra_protocols,
-            bandwidth_meter.clone(),
         );
 
         let state =
@@ -263,7 +254,6 @@ where
             local_peer_id,
             peers_handle,
             network_mode,
-            bandwidth_meter,
             Arc::new(AtomicU64::new(chain_spec.chain.id())),
             tx_gossip_disabled,
             discv4,

crates/net/network/src/network.rs

@@ -7,7 +7,6 @@ use enr::Enr;
 use parking_lot::Mutex;
 use reth_discv4::Discv4;
 use reth_eth_wire::{DisconnectReason, NewBlock, NewPooledTransactionHashes, SharedTransactions};
-use reth_net_common::bandwidth_meter::BandwidthMeter;
 use reth_network_api::{
     NetworkError, NetworkInfo, PeerInfo, PeerKind, Peers, PeersInfo, Reputation,
     ReputationChangeKind,
@@ -53,7 +52,6 @@ impl NetworkHandle {
         local_peer_id: PeerId,
         peers: PeersHandle,
         network_mode: NetworkMode,
-        bandwidth_meter: BandwidthMeter,
         chain_id: Arc<AtomicU64>,
         tx_gossip_disabled: bool,
         discv4: Option<Discv4>,
@@ -67,7 +65,6 @@ impl NetworkHandle {
             local_peer_id,
             peers,
             network_mode,
-            bandwidth_meter,
             is_syncing: Arc::new(AtomicBool::new(false)),
             initial_sync_done: Arc::new(AtomicBool::new(false)),
             chain_id,
@@ -154,11 +151,6 @@ impl NetworkHandle {
         rx.await.unwrap()
     }
 
-    /// Provides a shareable reference to the [`BandwidthMeter`] stored on the `NetworkInner`.
-    pub fn bandwidth_meter(&self) -> &BandwidthMeter {
-        &self.inner.bandwidth_meter
-    }
-
     /// Send message to gracefully shutdown node.
     ///
     /// This will disconnect all active and pending sessions and prevent
@@ -393,8 +385,6 @@ struct NetworkInner {
     peers: PeersHandle,
     /// The mode of the network
     network_mode: NetworkMode,
-    /// Used to measure inbound & outbound bandwidth across network streams (currently unused)
-    bandwidth_meter: BandwidthMeter,
     /// Represents if the network is currently syncing.
     is_syncing: Arc<AtomicBool>,
     /// Used to differentiate between an initial pipeline sync or a live sync