Fix merge conflicts with emhane/one-req-per-peer-bottleneck

paradigmxyz · Feb 22, 2024 · 358f3ac · 358f3ac
2 parents e03ab41 + 9065482
commit 358f3ac
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 125 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/net/network/Cargo.toml b/crates/net/network/Cargo.toml
@@ -92,6 +92,9 @@ ethers-middleware = { workspace = true, default-features = false }
 
 enr = { workspace = true, features = ["serde", "rust-secp256k1"] }
 
+# async
+futures-test = "0.3.30"
+
 # misc
 serial_test.workspace = true
 tempfile.workspace = true

diff --git a/crates/net/network/src/peers/mod.rs b/crates/net/network/src/peers/mod.rs
@@ -9,10 +9,10 @@ pub use reputation::ReputationChangeWeights;
 pub use reth_network_api::PeerKind;
 
 /// Maximum number of available slots for outbound sessions.
-pub(crate) const DEFAULT_MAX_COUNT_PEERS_OUTBOUND: u32 = 100;
+pub const DEFAULT_MAX_COUNT_PEERS_OUTBOUND: u32 = 100;
 
 /// Maximum number of available slots for inbound sessions.
-pub(crate) const DEFAULT_MAX_COUNT_PEERS_INBOUND: u32 = 30;
+pub const DEFAULT_MAX_COUNT_PEERS_INBOUND: u32 = 30;
 
 /// Maximum number of available slots concurrent outgoing dials.
-pub(crate) const DEFAULT_MAX_COUNT_CONCURRENT_DIALS: usize = 10;
+pub const DEFAULT_MAX_COUNT_CONCURRENT_DIALS: usize = 10;