From e810687ba7ec236c0e12be2366febab12d7e6523 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Tue, 6 Feb 2024 03:32:18 +0100 Subject: [PATCH] fix: put noop helper behind feature (#6433) --- crates/net/network/src/config.rs | 10 +++++++--- examples/polygon-p2p/src/main.rs | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/crates/net/network/src/config.rs b/crates/net/network/src/config.rs index f3752e8ac..129704933 100644 --- a/crates/net/network/src/config.rs +++ b/crates/net/network/src/config.rs @@ -14,7 +14,7 @@ use reth_eth_wire::{HelloMessage, HelloMessageWithProtocols, Status}; use reth_primitives::{ mainnet_nodes, sepolia_nodes, ChainSpec, ForkFilter, Head, NodeRecord, PeerId, MAINNET, }; -use reth_provider::{test_utils::NoopProvider, BlockReader, HeaderProvider}; +use reth_provider::{BlockReader, HeaderProvider}; use reth_tasks::{TaskSpawner, TokioTaskExecutor}; use secp256k1::SECP256K1; use std::{collections::HashSet, net::SocketAddr, sync::Arc}; @@ -412,8 +412,12 @@ impl NetworkConfigBuilder { self } - pub fn build_with_noop_provider(self) -> NetworkConfig { - self.build(NoopProvider::default()) + /// Convenience function for creating a [NetworkConfig] with a noop provider that does nothing. + #[cfg(any(test, feature = "test-utils"))] + pub fn build_with_noop_provider( + self, + ) -> NetworkConfig { + self.build(reth_provider::test_utils::NoopProvider::default()) } /// Consumes the type and creates the actual [`NetworkConfig`] diff --git a/examples/polygon-p2p/src/main.rs b/examples/polygon-p2p/src/main.rs index ce652f30a..acfa3d82b 100644 --- a/examples/polygon-p2p/src/main.rs +++ b/examples/polygon-p2p/src/main.rs @@ -14,6 +14,7 @@ use reth_discv4::Discv4ConfigBuilder; use reth_network::{ config::NetworkMode, NetworkConfig, NetworkEvent, NetworkEvents, NetworkManager, }; +use reth_provider::test_utils::NoopProvider; use reth_tracing::{ tracing::info, tracing_subscriber::filter::LevelFilter, LayerInfo, LogFormat, RethTracer, Tracer, @@ -24,6 +25,7 @@ use std::{ time::Duration, }; use tokio_stream::StreamExt; + pub mod chain_cfg; #[tokio::main] @@ -49,7 +51,7 @@ async fn main() { .set_head(head()) .network_mode(NetworkMode::Work) .listener_addr(local_addr) - .build_with_noop_provider(); + .build(NoopProvider::default()); // Set Discv4 lookup interval to 1 second let mut discv4_cfg = Discv4ConfigBuilder::default();