From 5ef0935c9778d90ce4b69c7b06daddbb1eec2da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Tue, 16 Nov 2021 23:09:13 +0100
Subject: [PATCH] udp: remove unused config var max_requests_per_iter

---
 aquatic_udp/src/lib/config.rs     | 4 ----
 aquatic_udp_bench/src/announce.rs | 4 +---
 aquatic_udp_bench/src/main.rs     | 2 --
 aquatic_udp_bench/src/scrape.rs   | 4 +---
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/aquatic_udp/src/lib/config.rs b/aquatic_udp/src/lib/config.rs
index 9bd5bc7..e9b3108 100644
--- a/aquatic_udp/src/lib/config.rs
+++ b/aquatic_udp/src/lib/config.rs
@@ -72,9 +72,6 @@ pub struct ProtocolConfig {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(default)]
 pub struct HandlerConfig {
-    /// Maximum number of requests to receive from channel before locking
-    /// mutex and starting work
-    pub max_requests_per_iter: usize,
     pub channel_recv_timeout_ms: u64,
 }
 
@@ -142,7 +139,6 @@ impl Default for ProtocolConfig {
 impl Default for HandlerConfig {
     fn default() -> Self {
         Self {
-            max_requests_per_iter: 10000,
             channel_recv_timeout_ms: 100,
         }
     }
diff --git a/aquatic_udp_bench/src/announce.rs b/aquatic_udp_bench/src/announce.rs
index 756bac7..1277c4e 100644
--- a/aquatic_udp_bench/src/announce.rs
+++ b/aquatic_udp_bench/src/announce.rs
@@ -7,7 +7,6 @@ use rand::Rng;
 use rand_distr::Pareto;
 
 use aquatic_udp::common::*;
-use aquatic_udp::config::Config;
 use aquatic_udp_protocol::*;
 
 use crate::common::*;
@@ -15,7 +14,6 @@ use crate::config::BenchConfig;
 
 pub fn bench_announce_handler(
     bench_config: &BenchConfig,
-    aquatic_config: &Config,
     request_sender: &Sender<(SocketWorkerIndex, ConnectedRequest, SocketAddr)>,
     response_receiver: &Receiver<(ConnectedResponse, SocketAddr)>,
     rng: &mut impl Rng,
@@ -23,7 +21,7 @@ pub fn bench_announce_handler(
 ) -> (usize, Duration) {
     let requests = create_requests(rng, info_hashes, bench_config.num_announce_requests);
 
-    let p = aquatic_config.handlers.max_requests_per_iter * bench_config.num_threads;
+    let p = 10_000 * bench_config.num_threads; // FIXME: adjust to sharded workers
     let mut num_responses = 0usize;
 
     let mut dummy: u16 = rng.gen();
diff --git a/aquatic_udp_bench/src/main.rs b/aquatic_udp_bench/src/main.rs
index 13c602e..1bc0034 100644
--- a/aquatic_udp_bench/src/main.rs
+++ b/aquatic_udp_bench/src/main.rs
@@ -59,7 +59,6 @@ pub fn run(bench_config: BenchConfig) -> ::anyhow::Result<()> {
 
     let a = announce::bench_announce_handler(
         &bench_config,
-        &aquatic_config,
         &request_sender,
         &response_receiver,
         &mut rng,
@@ -68,7 +67,6 @@ pub fn run(bench_config: BenchConfig) -> ::anyhow::Result<()> {
 
     let s = scrape::bench_scrape_handler(
         &bench_config,
-        &aquatic_config,
         &request_sender,
         &response_receiver,
         &mut rng,
diff --git a/aquatic_udp_bench/src/scrape.rs b/aquatic_udp_bench/src/scrape.rs
index 4cef9c0..fc058cb 100644
--- a/aquatic_udp_bench/src/scrape.rs
+++ b/aquatic_udp_bench/src/scrape.rs
@@ -7,7 +7,6 @@ use rand::Rng;
 use rand_distr::Pareto;
 
 use aquatic_udp::common::*;
-use aquatic_udp::config::Config;
 use aquatic_udp_protocol::*;
 
 use crate::common::*;
@@ -15,7 +14,6 @@ use crate::config::BenchConfig;
 
 pub fn bench_scrape_handler(
     bench_config: &BenchConfig,
-    aquatic_config: &Config,
     request_sender: &Sender<(SocketWorkerIndex, ConnectedRequest, SocketAddr)>,
     response_receiver: &Receiver<(ConnectedResponse, SocketAddr)>,
     rng: &mut impl Rng,
@@ -28,7 +26,7 @@ pub fn bench_scrape_handler(
         bench_config.num_hashes_per_scrape_request,
     );
 
-    let p = aquatic_config.handlers.max_requests_per_iter * bench_config.num_threads;
+    let p = 10_000 * bench_config.num_threads; // FIXME: adjust to sharded workers
     let mut num_responses = 0usize;
 
     let mut dummy: i32 = rng.gen();