Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

eth for NetworkConfigBuilder #14109

Merged
merged 2 commits into from
Jan 30, 2025
Merged

eth for NetworkConfigBuilder #14109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bace57
`eth` for NetworkConfigBuilder
int88 Jan 30, 2025
3999294
fix comments
int88 Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions crates/net/network/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,13 @@ pub struct NetworkConfigBuilder<N: NetworkPrimitives = EthNetworkPrimitives> {
nat: Option<NatResolver>,
}

impl NetworkConfigBuilder<EthNetworkPrimitives> {
/// Creates the `NetworkConfigBuilder` with [`EthNetworkPrimitives`] types.
pub fn eth(secret_key: SecretKey) -> Self {
Self::new(secret_key)
}
}

// === impl NetworkConfigBuilder ===

#[allow(missing_docs)]
Expand Down
2 changes: 1 addition & 1 deletion crates/net/network/src/transactions/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1998,7 +1998,7 @@ mod tests {

let client = NoopProvider::default();
let pool = testing_pool();
let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.disable_discovery()
.listener_port(0)
.build(client);
Expand Down
19 changes: 7 additions & 12 deletions crates/net/network/tests/it/connect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,8 @@ async fn test_connect_with_boot_nodes() {
let mut discv4 = Discv4Config::builder();
discv4.add_boot_nodes(mainnet_nodes());

let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
.discovery(discv4)
.build(NoopProvider::default());
let config =
NetworkConfigBuilder::eth(secret_key).discovery(discv4).build(NoopProvider::default());
let network = NetworkManager::new(config).await.unwrap();

let handle = network.handle().clone();
Expand All @@ -231,9 +230,7 @@ async fn test_connect_with_builder() {
discv4.add_boot_nodes(mainnet_nodes());

let client = NoopProvider::default();
let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
.discovery(discv4)
.build(client.clone());
let config = NetworkConfigBuilder::eth(secret_key).discovery(discv4).build(client.clone());
let (handle, network, _, requests) = NetworkManager::new(config)
.await
.unwrap()
Expand Down Expand Up @@ -269,9 +266,7 @@ async fn test_connect_to_trusted_peer() {
let discv4 = Discv4Config::builder();

let client = NoopProvider::default();
let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
.discovery(discv4)
.build(client.clone());
let config = NetworkConfigBuilder::eth(secret_key).discovery(discv4).build(client.clone());
let transactions_manager_config = config.transactions_manager_config.clone();
let (handle, network, transactions, requests) = NetworkManager::new(config)
.await
Expand Down Expand Up @@ -473,7 +468,7 @@ async fn test_geth_disconnect() {
tokio::time::timeout(GETH_TIMEOUT, async move {
let secret_key = SecretKey::new(&mut rand::thread_rng());

let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.listener_port(0)
.disable_discovery()
.build(NoopProvider::default());
Expand Down Expand Up @@ -588,7 +583,7 @@ async fn test_exceed_outgoing_connections() {
let secret_key = SecretKey::new(&mut rand::thread_rng());
let peers_config = PeersConfig::default().with_max_outbound(1);

let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.listener_port(0)
.disable_discovery()
.peer_config(peers_config)
Expand Down Expand Up @@ -629,7 +624,7 @@ async fn test_disconnect_incoming_when_exceeded_incoming_connections() {
let secret_key = SecretKey::new(&mut rand::thread_rng());
let peers_config = PeersConfig::default().with_max_inbound(0);

let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.listener_port(0)
.disable_discovery()
.peer_config(peers_config)
Expand Down
15 changes: 7 additions & 8 deletions crates/net/network/tests/it/startup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use std::{

use reth_chainspec::MAINNET;
use reth_discv4::{Discv4Config, NatResolver};
use reth_eth_wire::EthNetworkPrimitives;
use reth_network::{
error::{NetworkError, ServiceKind},
Discovery, NetworkConfigBuilder, NetworkManager,
Expand All @@ -27,7 +26,7 @@ fn is_addr_in_use_kind(err: &NetworkError, kind: ServiceKind) -> bool {
#[tokio::test(flavor = "multi_thread")]
async fn test_is_default_syncing() {
let secret_key = SecretKey::new(&mut rand::thread_rng());
let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.disable_discovery()
.listener_port(0)
.build(NoopProvider::default());
Expand All @@ -38,13 +37,13 @@ async fn test_is_default_syncing() {
#[tokio::test(flavor = "multi_thread")]
async fn test_listener_addr_in_use() {
let secret_key = SecretKey::new(&mut rand::thread_rng());
let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.disable_discovery()
.listener_port(0)
.build(NoopProvider::default());
let network = NetworkManager::new(config).await.unwrap();
let listener_port = network.local_addr().port();
let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.listener_port(listener_port)
.disable_discovery()
.build(NoopProvider::default());
Expand Down Expand Up @@ -73,7 +72,7 @@ async fn test_discovery_addr_in_use() {
#[tokio::test(flavor = "multi_thread")]
async fn test_tcp_port_node_record_no_discovery() {
let secret_key = SecretKey::new(&mut rand::thread_rng());
let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.listener_port(0)
.disable_discovery()
.build_with_noop_provider(MAINNET.clone());
Expand All @@ -91,7 +90,7 @@ async fn test_tcp_port_node_record_no_discovery() {
#[tokio::test(flavor = "multi_thread")]
async fn test_tcp_port_node_record_discovery() {
let secret_key = SecretKey::new(&mut rand::thread_rng());
let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.listener_port(0)
.discovery_port(0)
.disable_dns_discovery()
Expand All @@ -110,7 +109,7 @@ async fn test_tcp_port_node_record_discovery() {
#[tokio::test(flavor = "multi_thread")]
async fn test_node_record_address_with_nat() {
let secret_key = SecretKey::new(&mut rand::thread_rng());
let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.add_nat(Some(NatResolver::ExternalIp("10.1.1.1".parse().unwrap())))
.disable_discv4_discovery()
.disable_dns_discovery()
Expand All @@ -126,7 +125,7 @@ async fn test_node_record_address_with_nat() {
#[tokio::test(flavor = "multi_thread")]
async fn test_node_record_address_with_nat_disable_discovery() {
let secret_key = SecretKey::new(&mut rand::thread_rng());
let config = NetworkConfigBuilder::<EthNetworkPrimitives>::new(secret_key)
let config = NetworkConfigBuilder::eth(secret_key)
.add_nat(Some(NatResolver::ExternalIp("10.1.1.1".parse().unwrap())))
.disable_discovery()
.listener_port(0)
Expand Down
Loading