github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-29 17:18:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: unify disable discovery builder functions (#2164)

Browse Source
This commit is contained in:
Matthias Seitz
2023-04-09 20:11:19 +02:00
committed by GitHub
parent b2c3074260
commit 76c9a547b7
3 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
crates/net/network/src/config.rs
View File

@@ -271,29 +271,12 @@ impl NetworkConfigBuilder {
self
}
/// Disables Discv4 discovery.
pub fn no_discv4_discovery(mut self) -> Self {
self.discovery_v4_builder = None;
self
}
/// Sets the dns discovery config to use.
pub fn dns_discovery(mut self, config: DnsDiscoveryConfig) -> Self {
self.dns_discovery_config = Some(config);
self
}
/// Disables DNS discovery
pub fn no_dns_discovery(mut self) -> Self {
self.dns_discovery_config = None;
self
}
/// Disables all discovery.
pub fn no_discovery(self) -> Self {
self.no_discv4_discovery().no_dns_discovery()
}
/// Sets the boot nodes.
pub fn boot_nodes(mut self, nodes: impl IntoIterator<Item = NodeRecord>) -> Self {
self.boot_nodes = nodes.into_iter().collect();
@@ -306,12 +289,44 @@ impl NetworkConfigBuilder {
self
}
/// Disables all discovery.
pub fn disable_discovery(self) -> Self {
self.disable_discv4_discovery().disable_dns_discovery()
}
/// Disables all discovery if the given condition is true.
pub fn disable_discovery_if(self, disable: bool) -> Self {
if disable {
self.disable_discovery()
} else {
self
}
}
/// Disable the Discv4 discovery.
pub fn disable_discv4_discovery(mut self) -> Self {
self.discovery_v4_builder = None;
self
}
/// Disable the DNS discovery if the given condition is true.
pub fn disable_dns_discovery_if(self, disable: bool) -> Self {
if disable {
self.disable_dns_discovery()
} else {
self
}
}
/// Disable the Discv4 discovery if the given condition is true.
pub fn disable_discv4_discovery_if(self, disable: bool) -> Self {
if disable {
self.disable_discv4_discovery()
} else {
self
}
}
/// Consumes the type and creates the actual [`NetworkConfig`]
/// for the given client type that can interact with the chain.
pub fn build<C>(self, client: C) -> NetworkConfig<C> {

4
crates/net/network/src/test_utils/testnet.rs
View File

@@ -316,8 +316,8 @@ where
NetworkConfigBuilder::new(secret_key)
.listener_addr(SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0)))
.discovery_addr(SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0)))
.no_dns_discovery()
.no_discv4_discovery()
.disable_dns_discovery()
.disable_discv4_discovery()
}
}

18
crates/net/network/src/transactions.rs
View File

@@ -728,8 +728,10 @@ mod tests {
let client = NoopProvider::default();
let pool = testing_pool();
let config =
NetworkConfigBuilder::new(secret_key).no_discovery().listener_port(0).build(client);
let config = NetworkConfigBuilder::new(secret_key)
.disable_discovery()
.listener_port(0)
.build(client);
let (handle, network, mut transactions, _) = NetworkManager::new(config)
.await
.unwrap()
@@ -771,8 +773,10 @@ mod tests {
let client = NoopProvider::default();
let pool = testing_pool();
let config =
NetworkConfigBuilder::new(secret_key).no_discovery().listener_port(0).build(client);
let config = NetworkConfigBuilder::new(secret_key)
.disable_discovery()
.listener_port(0)
.build(client);
let (network_handle, network, mut transactions, _) = NetworkManager::new(config)
.await
.unwrap()
@@ -844,8 +848,10 @@ mod tests {
let client = NoopProvider::default();
let pool = testing_pool();
let config =
NetworkConfigBuilder::new(secret_key).no_discovery().listener_port(0).build(client);
let config = NetworkConfigBuilder::new(secret_key)
.disable_discovery()
.listener_port(0)
.build(client);
let (network_handle, network, mut transactions, _) = NetworkManager::new(config)
.await
.unwrap()