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

feat(net): use NodeRecord instead of enode format (#530)

Browse Source 
* feat(eth-wire): add timeouts to tests using Geth

* feat(net): use NodeRecord instead of enode format

 * make NodeRecord::new pub instead of pub(crate)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Dan Cline
2022-12-19 17:57:02 -05:00
committed by GitHub
parent ac1c0419d2
commit c53b2bcccb
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/net/discv4/src/node.rs
View File

@@ -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 }
}

12
crates/net/network/tests/it/connect.rs
View File

@@ -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);