From 7de61b58b8ded5e8fa5beba5e46e38fc92474e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= Date: Thu, 10 Aug 2023 12:31:03 +0100 Subject: [PATCH] fix benchmarks --- beacon_node/lighthouse_network/tests/common.rs | 2 +- beacon_node/src/config.rs | 2 +- lcli/src/generate_bootnode_enr.rs | 2 +- lighthouse/tests/beacon_node.rs | 2 +- testing/simulator/src/local_network.rs | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/beacon_node/lighthouse_network/tests/common.rs b/beacon_node/lighthouse_network/tests/common.rs index 9ff10f278d0..c190ec0143c 100644 --- a/beacon_node/lighthouse_network/tests/common.rs +++ b/beacon_node/lighthouse_network/tests/common.rs @@ -76,7 +76,7 @@ pub fn build_config(port: u16, mut boot_nodes: Vec) -> NetworkConfig { .unwrap(); config.set_ipv4_listening_address(std::net::Ipv4Addr::UNSPECIFIED, port, port, port + 1); - config.enr_disc4_port = Some(port); + config.enr_udp4_port = Some(port); config.enr_address = (Some(std::net::Ipv4Addr::LOCALHOST), None); config.boot_nodes_enr.append(&mut boot_nodes); config.network_dir = path.into_path(); diff --git a/beacon_node/src/config.rs b/beacon_node/src/config.rs index 2663eb907af..7ef97f6168f 100644 --- a/beacon_node/src/config.rs +++ b/beacon_node/src/config.rs @@ -1433,4 +1433,4 @@ where .into_iter() .next() .ok_or(format!("Must provide at least one value to {}", flag_name)) -} \ No newline at end of file +} diff --git a/lcli/src/generate_bootnode_enr.rs b/lcli/src/generate_bootnode_enr.rs index 84151b6d1e5..0584cd65496 100644 --- a/lcli/src/generate_bootnode_enr.rs +++ b/lcli/src/generate_bootnode_enr.rs @@ -27,7 +27,7 @@ pub fn run(matches: &ArgMatches) -> Result<(), String> { let mut config = NetworkConfig::default(); config.enr_address = (Some(ip), None); - config.enr_disc4_port = Some(udp_port); + config.enr_udp4_port = Some(udp_port); config.enr_tcp6_port = Some(tcp_port); let secp256k1_keypair = secp256k1::Keypair::generate(); diff --git a/lighthouse/tests/beacon_node.rs b/lighthouse/tests/beacon_node.rs index 817885f5d35..55a28ed927a 100644 --- a/lighthouse/tests/beacon_node.rs +++ b/lighthouse/tests/beacon_node.rs @@ -2357,4 +2357,4 @@ fn progressive_balances_fast() { ProgressiveBalancesMode::Fast ) }); -} \ No newline at end of file +} diff --git a/testing/simulator/src/local_network.rs b/testing/simulator/src/local_network.rs index 02d844bf3d0..70ba1f4759d 100644 --- a/testing/simulator/src/local_network.rs +++ b/testing/simulator/src/local_network.rs @@ -66,7 +66,7 @@ impl LocalNetwork { BOOTNODE_PORT, QUIC_PORT, ); - beacon_config.network.enr_disc4_port = Some(BOOTNODE_PORT); + beacon_config.network.enr_udp4_port = Some(BOOTNODE_PORT); beacon_config.network.enr_tcp4_port = Some(BOOTNODE_PORT); beacon_config.network.discv5_config.table_filter = |_| true; @@ -158,7 +158,7 @@ impl LocalNetwork { BOOTNODE_PORT + count, BOOTNODE_PORT + 1000 + count, // Offset the quick ports by 1000 ); - beacon_config.network.enr_disc4_port = Some(BOOTNODE_PORT + count); + beacon_config.network.enr_udp4_port = Some(BOOTNODE_PORT + count); beacon_config.network.enr_tcp4_port = Some(BOOTNODE_PORT + count); beacon_config.network.discv5_config.table_filter = |_| true; beacon_config.network.proposer_only = is_proposer;