From 8871d0eec825c91090dd642332ad13b2bb14f4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Wed, 3 Nov 2021 00:11:24 +0100
Subject: [PATCH] http and ws: rename cleaning.interval to
 torrent_cleaning_interval

---
 aquatic_http/src/lib/config.rs   | 7 ++-----
 aquatic_http/src/lib/handlers.rs | 2 +-
 aquatic_http/src/lib/network.rs  | 4 +++-
 aquatic_ws/src/lib/config.rs     | 4 ++--
 aquatic_ws/src/lib/handlers.rs   | 2 +-
 aquatic_ws/src/lib/network.rs    | 4 +++-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/aquatic_http/src/lib/config.rs b/aquatic_http/src/lib/config.rs
index e2e3131..09e690c 100644
--- a/aquatic_http/src/lib/config.rs
+++ b/aquatic_http/src/lib/config.rs
@@ -57,11 +57,9 @@ pub struct ProtocolConfig {
 #[serde(default)]
 pub struct CleaningConfig {
     /// Clean peers this often (seconds)
-    pub interval: u64,
+    pub torrent_cleaning_interval: u64,
     /// Remove peers that haven't announced for this long (seconds)
     pub max_peer_age: u64,
-    /// Remove connections that are older than this (seconds)
-    pub max_connection_age: u64,
 }
 
 impl Default for Config {
@@ -105,9 +103,8 @@ impl Default for ProtocolConfig {
 impl Default for CleaningConfig {
     fn default() -> Self {
         Self {
-            interval: 30,
+            torrent_cleaning_interval: 30,
             max_peer_age: 1800,
-            max_connection_age: 1800,
         }
     }
 }
diff --git a/aquatic_http/src/lib/handlers.rs b/aquatic_http/src/lib/handlers.rs
index eb46d50..bdd9239 100644
--- a/aquatic_http/src/lib/handlers.rs
+++ b/aquatic_http/src/lib/handlers.rs
@@ -41,7 +41,7 @@ pub async fn run_request_worker(
         enclose!((config, torrents, access_list) move || async move {
             torrents.borrow_mut().clean(&config, &access_list);
 
-            Some(Duration::from_secs(config.cleaning.interval))
+            Some(Duration::from_secs(config.cleaning.torrent_cleaning_interval))
         })()
     }));
 
diff --git a/aquatic_http/src/lib/network.rs b/aquatic_http/src/lib/network.rs
index fd35ab1..51ed339 100644
--- a/aquatic_http/src/lib/network.rs
+++ b/aquatic_http/src/lib/network.rs
@@ -136,7 +136,9 @@ async fn remove_closed_connections(
         }
     }
 
-    Some(Duration::from_secs(config.cleaning.interval))
+    Some(Duration::from_secs(
+        config.cleaning.torrent_cleaning_interval,
+    ))
 }
 
 async fn receive_responses(
diff --git a/aquatic_ws/src/lib/config.rs b/aquatic_ws/src/lib/config.rs
index ed9dd94..a73e870 100644
--- a/aquatic_ws/src/lib/config.rs
+++ b/aquatic_ws/src/lib/config.rs
@@ -59,7 +59,7 @@ pub struct ProtocolConfig {
 #[serde(default)]
 pub struct CleaningConfig {
     /// Clean peers this often (seconds)
-    pub interval: u64,
+    pub torrent_cleaning_interval: u64,
     /// Remove peers that haven't announced for this long (seconds)
     pub max_peer_age: u64,
 }
@@ -106,7 +106,7 @@ impl Default for ProtocolConfig {
 impl Default for CleaningConfig {
     fn default() -> Self {
         Self {
-            interval: 30,
+            torrent_cleaning_interval: 30,
             max_peer_age: 1800,
         }
     }
diff --git a/aquatic_ws/src/lib/handlers.rs b/aquatic_ws/src/lib/handlers.rs
index 9b6100d..cd64de3 100644
--- a/aquatic_ws/src/lib/handlers.rs
+++ b/aquatic_ws/src/lib/handlers.rs
@@ -35,7 +35,7 @@ pub async fn run_request_worker(
         enclose!((config, torrents, access_list) move || async move {
             torrents.borrow_mut().clean(&config, &access_list);
 
-            Some(Duration::from_secs(config.cleaning.interval))
+            Some(Duration::from_secs(config.cleaning.torrent_cleaning_interval))
         })()
     }));
 
diff --git a/aquatic_ws/src/lib/network.rs b/aquatic_ws/src/lib/network.rs
index 64fbbfa..f4e71ca 100644
--- a/aquatic_ws/src/lib/network.rs
+++ b/aquatic_ws/src/lib/network.rs
@@ -137,7 +137,9 @@ async fn remove_closed_connections(
         }
     }
 
-    Some(Duration::from_secs(config.cleaning.interval))
+    Some(Duration::from_secs(
+        config.cleaning.torrent_cleaning_interval,
+    ))
 }
 
 async fn receive_out_messages(