refactor: [#1282] move BanService to udp-tracker-core package

Author: josecelano

src/bootstrap/app.rs

@@ -35,8 +35,8 @@ use tracing::instrument;
 use super::config::initialize_configuration;
 use crate::bootstrap;
 use crate::container::AppContainer;
+use crate::packages::udp_tracker_core::services::banning::BanService;
 use crate::packages::{http_tracker_core, udp_tracker_core};
-use crate::servers::udp::server::banning::BanService;
 use crate::servers::udp::server::launcher::MAX_CONNECTION_ID_ERRORS_PER_IP;
 use crate::shared::crypto::ephemeral_instance_keys;
 use crate::shared::crypto::keys::{self, Keeper as _};

src/container.rs

@@ -14,8 +14,9 @@ use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist
 use tokio::sync::RwLock;
 use torrust_tracker_configuration::{Core, HttpApi, HttpTracker, UdpTracker};
 
-use crate::packages::{http_tracker_core, udp_tracker_core};
-use crate::servers::udp::server::banning::BanService;
+use crate::packages::http_tracker_core;
+use crate::packages::udp_tracker_core::services::banning::BanService;
+use crate::packages::udp_tracker_core::{self};
 
 pub struct AppContainer {
     pub core_config: Arc<Core>,

src/packages/tracker_api_core/statistics/services.rs

@@ -5,8 +5,9 @@ use packages::tracker_api_core::statistics::metrics::Metrics;
 use tokio::sync::RwLock;
 use torrust_tracker_primitives::torrent_metrics::TorrentsMetrics;
 
-use crate::packages::{self, http_tracker_core, udp_tracker_core};
-use crate::servers::udp::server::banning::BanService;
+use crate::packages::udp_tracker_core::services::banning::BanService;
+use crate::packages::udp_tracker_core::{self};
+use crate::packages::{self, http_tracker_core};
 
 /// All the metrics collected by the tracker.
 #[derive(Debug, PartialEq)]
@@ -83,8 +84,8 @@ mod tests {
 
     use crate::packages::tracker_api_core::statistics::metrics::Metrics;
     use crate::packages::tracker_api_core::statistics::services::{get_metrics, TrackerMetrics};
+    use crate::packages::udp_tracker_core::services::banning::BanService;
     use crate::packages::{http_tracker_core, udp_tracker_core};
-    use crate::servers::udp::server::banning::BanService;
     use crate::servers::udp::server::launcher::MAX_CONNECTION_ID_ERRORS_PER_IP;
 
     pub fn tracker_configuration() -> Configuration {

src/servers/udp/server/banning.rs src/packages/udp_tracker_core/services/banning.rs

@@ -1,4 +1,5 @@
 pub mod announce;
+pub mod banning;
 pub mod connect;
 pub mod scrape;
 

src/packages/udp_tracker_core/services/mod.rs

@@ -45,7 +45,7 @@ use tokio::sync::RwLock;
 use torrust_tracker_primitives::torrent_metrics::TorrentsMetrics;
 
 use crate::packages;
-use crate::servers::udp::server::banning::BanService;
+use crate::packages::udp_tracker_core::services::banning::BanService;
 
 /// All the metrics collected by the tracker.
 #[derive(Debug, PartialEq)]
@@ -111,9 +111,9 @@ mod tests {
     use torrust_tracker_test_helpers::configuration;
 
     use crate::packages::udp_tracker_core;
+    use crate::packages::udp_tracker_core::services::banning::BanService;
     use crate::packages::udp_tracker_core::statistics;
     use crate::packages::udp_tracker_core::statistics::services::{get_metrics, TrackerMetrics};
-    use crate::servers::udp::server::banning::BanService;
     use crate::servers::udp::server::launcher::MAX_CONNECTION_ID_ERRORS_PER_IP;
 
     pub fn tracker_configuration() -> Configuration {

src/packages/udp_tracker_core/statistics/services.rs

@@ -11,8 +11,8 @@ use tokio::sync::RwLock;
 
 use super::responses::{metrics_response, stats_response};
 use crate::packages::tracker_api_core::statistics::services::get_metrics;
+use crate::packages::udp_tracker_core::services::banning::BanService;
 use crate::packages::{http_tracker_core, udp_tracker_core};
-use crate::servers::udp::server::banning::BanService;
 
 #[derive(Deserialize, Debug, Default)]
 #[serde(rename_all = "lowercase")]

src/servers/apis/v1/context/stats/handlers.rs

@@ -6,7 +6,6 @@ use thiserror::Error;
 
 use super::RawRequest;
 
-pub mod banning;
 pub mod bound_socket;
 pub mod launcher;
 pub mod processor;