jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove unused genesis_hash in NetworkState and NetworkManager (#6704)

Browse Source
This commit is contained in:
Dan Cline
2024-02-21 07:03:04 -05:00
committed by GitHub
parent a43885e5d8
commit a554c1fbf8
2 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/net/network/src/manager.rs
View File

@ -42,7 +42,7 @@ use reth_eth_wire::{
use reth_metrics::common::mpsc::UnboundedMeteredSender; use reth_metrics::common::mpsc::UnboundedMeteredSender;
use reth_net_common::bandwidth_meter::BandwidthMeter; use reth_net_common::bandwidth_meter::BandwidthMeter;
use reth_network_api::ReputationChangeKind; use reth_network_api::ReputationChangeKind;
use reth_primitives::{ForkId, NodeRecord, PeerId, B256}; use reth_primitives::{ForkId, NodeRecord, PeerId};
use reth_provider::{BlockNumReader, BlockReader}; use reth_provider::{BlockNumReader, BlockReader};
use reth_rpc_types::{EthProtocolInfo, NetworkStatus}; use reth_rpc_types::{EthProtocolInfo, NetworkStatus};
use reth_tasks::shutdown::GracefulShutdown; use reth_tasks::shutdown::GracefulShutdown;
@ -217,13 +217,8 @@ where
bandwidth_meter.clone(), bandwidth_meter.clone(),
); );
let state = NetworkState::new( let state =
client, NetworkState::new(client, discovery, peers_manager, Arc::clone(&num_active_peers));
discovery,
peers_manager,
chain_spec.genesis_hash(),
Arc::clone(&num_active_peers),
);
let swarm = Swarm::new(incoming, sessions, state); let swarm = Swarm::new(incoming, sessions, state);
@ -303,11 +298,6 @@ where
self.swarm.listener().local_address() self.swarm.listener().local_address()
} }
/// Returns the configured genesis hash
pub fn genesis_hash(&self) -> B256 {
self.swarm.state().genesis_hash()
}
/// How many peers we're currently connected to. /// How many peers we're currently connected to.
pub fn num_connected_peers(&self) -> usize { pub fn num_connected_peers(&self) -> usize {
self.swarm.state().num_active_peers() self.swarm.state().num_active_peers()

10
crates/net/network/src/state.rs
View File

@ -61,8 +61,6 @@ pub struct NetworkState<C> {
client: C, client: C,
/// Network discovery. /// Network discovery.
discovery: Discovery, discovery: Discovery,
/// The genesis hash of the network we're on
genesis_hash: B256,
/// The type that handles requests. /// The type that handles requests.
/// ///
/// The fetcher streams RLPx related requests on a per-peer basis to this type. This type will /// The fetcher streams RLPx related requests on a per-peer basis to this type. This type will
@ -79,7 +77,6 @@ where
client: C, client: C,
discovery: Discovery, discovery: Discovery,
peers_manager: PeersManager, peers_manager: PeersManager,
genesis_hash: B256,
num_active_peers: Arc<AtomicUsize>, num_active_peers: Arc<AtomicUsize>,
) -> Self { ) -> Self {
let state_fetcher = StateFetcher::new(peers_manager.handle(), num_active_peers); let state_fetcher = StateFetcher::new(peers_manager.handle(), num_active_peers);
@ -89,7 +86,6 @@ where
queued_messages: Default::default(), queued_messages: Default::default(),
client, client,
discovery, discovery,
genesis_hash,
state_fetcher, state_fetcher,
} }
} }
@ -114,11 +110,6 @@ where
self.state_fetcher.client() self.state_fetcher.client()
} }
/// Configured genesis hash.
pub fn genesis_hash(&self) -> B256 {
self.genesis_hash
}
/// How many peers we're currently connected to. /// How many peers we're currently connected to.
pub fn num_active_peers(&self) -> usize { pub fn num_active_peers(&self) -> usize {
self.active_peers.len() self.active_peers.len()
@ -556,7 +547,6 @@ mod tests {
queued_messages: Default::default(), queued_messages: Default::default(),
client: NoopProvider::default(), client: NoopProvider::default(),
discovery: Discovery::noop(), discovery: Discovery::noop(),
genesis_hash: Default::default(),
state_fetcher: StateFetcher::new(handle, Default::default()), state_fetcher: StateFetcher::new(handle, Default::default()),
} }
} }