diff --git a/crates/net/discv4/src/node.rs b/crates/net/discv4/src/node.rs index 1c12de9602..2b77eb6b0e 100644 --- a/crates/net/discv4/src/node.rs +++ b/crates/net/discv4/src/node.rs @@ -62,9 +62,9 @@ impl NodeRecord { Self::new(addr, id) } - /// Creates a new record + /// Creates a new record from a socket addr and peer id. #[allow(unused)] - pub(crate) fn new(addr: SocketAddr, id: PeerId) -> Self { + pub fn new(addr: SocketAddr, id: PeerId) -> Self { Self { address: addr.ip(), tcp_port: addr.port(), udp_port: addr.port(), id } } diff --git a/crates/net/network/tests/it/connect.rs b/crates/net/network/tests/it/connect.rs index 7b5e12b28e..1ec4308959 100644 --- a/crates/net/network/tests/it/connect.rs +++ b/crates/net/network/tests/it/connect.rs @@ -7,7 +7,7 @@ use enr::EnrPublicKey; use ethers_core::utils::Geth; use ethers_providers::{Http, Middleware, Provider}; use futures::StreamExt; -use reth_discv4::{bootnodes::mainnet_nodes, Discv4Config}; +use reth_discv4::{bootnodes::mainnet_nodes, Discv4Config, NodeRecord}; use reth_net_common::ban_list::BanList; use reth_network::{NetworkConfig, NetworkEvent, NetworkManager, PeersConfig}; use reth_primitives::PeerId; @@ -163,10 +163,9 @@ async fn test_incoming_node_id_blacklist() { tokio::task::spawn(network); // make geth connect to us - let our_peer_id = handle.peer_id(); - let our_enode = format!("enode://{}@{}", hex::encode(our_peer_id.0), reth_p2p_socket); + let our_enode = NodeRecord::new(reth_p2p_socket, *handle.peer_id()); - provider.add_peer(our_enode).await.unwrap(); + provider.add_peer(our_enode.to_string()).await.unwrap(); let mut event_stream = NetworkEventStream::new(events); @@ -212,10 +211,9 @@ async fn test_incoming_connect_with_single_geth() { tokio::task::spawn(network); // make geth connect to us - let our_peer_id = handle.peer_id(); - let our_enode = format!("enode://{}@{}", hex::encode(our_peer_id.0), reth_p2p_socket); + let our_enode = NodeRecord::new(reth_p2p_socket, *handle.peer_id()); - provider.add_peer(our_enode).await.unwrap(); + provider.add_peer(our_enode.to_string()).await.unwrap(); let events = handle.event_listener(); let mut event_stream = NetworkEventStream::new(events);