refactor: [#1478] inline factory fn in udp server stats

Author: josecelano

packages/rest-tracker-api-core/src/statistics/services.rs

@@ -162,11 +162,8 @@ mod tests {
             let _unused = run_event_listener(http_stats_keeper.receiver(), &http_stats_repository);
         }
 
-        // UDP core stats (not used in this test)
-
         // UDP server stats
-        let (_udp_server_stats_keeper, udp_server_stats_repository) =
-            torrust_udp_tracker_server::statistics::setup::factory(config.core.tracker_usage_statistics);
+        let udp_server_stats_repository = Arc::new(torrust_udp_tracker_server::statistics::repository::Repository::new());
 
         let tracker_metrics = get_metrics(
             in_memory_torrent_repository.clone(),

packages/udp-tracker-server/src/container.rs

@@ -2,7 +2,11 @@ use std::sync::Arc;
 
 use torrust_tracker_configuration::Core;
 
-use crate::{event, statistics};
+use crate::event::sender::Broadcaster;
+use crate::event::{self};
+use crate::statistics;
+use crate::statistics::keeper::Keeper;
+use crate::statistics::repository::Repository;
 
 pub struct UdpTrackerServerContainer {
     pub stats_keeper: Arc<statistics::keeper::Keeper>,
@@ -32,8 +36,13 @@ pub struct UdpTrackerServerServices {
 impl UdpTrackerServerServices {
     #[must_use]
     pub fn initialize(core_config: &Arc<Core>) -> Arc<Self> {
-        let (udp_server_stats_keeper, udp_server_stats_repository) =
-            statistics::setup::factory(core_config.tracker_usage_statistics);
+        let udp_server_broadcaster = Broadcaster::default();
+        let udp_server_stats_repository = Arc::new(Repository::new());
+        let udp_server_stats_keeper = Arc::new(Keeper::new(
+            core_config.tracker_usage_statistics,
+            udp_server_broadcaster.clone(),
+        ));
+
         let udp_server_stats_event_sender = udp_server_stats_keeper.sender();
 
         Arc::new(Self {

packages/udp-tracker-server/src/handlers/announce.rs

@@ -374,7 +374,9 @@ mod tests {
                 core_tracker_services: Arc<CoreTrackerServices>,
                 core_udp_tracker_services: Arc<CoreUdpTrackerServices>,
             ) -> Response {
-                let (keeper, _repository) = crate::statistics::setup::factory(false);
+                let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
+                let keeper = Arc::new(crate::statistics::keeper::Keeper::new(false, udp_server_broadcaster.clone()));
+
                 let udp_server_stats_event_sender = keeper.sender();
 
                 let client_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1)), 8080);
@@ -712,7 +714,9 @@ mod tests {
                 let core_keeper = Arc::new(Keeper::new(false, udp_core_broadcaster.clone()));
                 let udp_core_stats_event_sender = core_keeper.sender();
 
-                let (server_keeper, _server_repository) = crate::statistics::setup::factory(false);
+                let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
+                let server_keeper = Arc::new(crate::statistics::keeper::Keeper::new(false, udp_server_broadcaster.clone()));
+
                 let udp_server_stats_event_sender = server_keeper.sender();
 
                 let client_ip_v4 = Ipv4Addr::new(126, 0, 0, 1);

packages/udp-tracker-server/src/handlers/connect.rs

@@ -87,7 +87,9 @@ mod tests {
             let core_keeper = Arc::new(Keeper::new(false, udp_core_broadcaster.clone()));
             let udp_core_stats_event_sender = core_keeper.sender();
 
-            let (server_keeper, _server_repository) = crate::statistics::setup::factory(false);
+            let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
+            let server_keeper = Arc::new(crate::statistics::keeper::Keeper::new(false, udp_server_broadcaster.clone()));
+
             let udp_server_stats_event_sender = server_keeper.sender();
 
             let request = ConnectRequest {
@@ -124,7 +126,9 @@ mod tests {
             let core_keeper = Arc::new(Keeper::new(false, udp_core_broadcaster.clone()));
             let udp_core_stats_event_sender = core_keeper.sender();
 
-            let (server_keeper, _server_repository) = crate::statistics::setup::factory(false);
+            let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
+            let server_keeper = Arc::new(crate::statistics::keeper::Keeper::new(false, udp_server_broadcaster.clone()));
+
             let udp_server_stats_event_sender = server_keeper.sender();
 
             let request = ConnectRequest {
@@ -162,7 +166,9 @@ mod tests {
 
             let udp_core_stats_event_sender = core_keeper.sender();
 
-            let (server_keeper, _server_repository) = crate::statistics::setup::factory(false);
+            let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
+            let server_keeper = Arc::new(crate::statistics::keeper::Keeper::new(false, udp_server_broadcaster.clone()));
+
             let udp_server_stats_event_sender = server_keeper.sender();
 
             let request = ConnectRequest {

packages/udp-tracker-server/src/handlers/mod.rs

@@ -231,7 +231,6 @@ pub(crate) mod tests {
     use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
     use torrust_tracker_test_helpers::configuration;
 
-    use crate::statistics::repository::Repository;
     use crate::{event as server_event, CurrentClock};
 
     pub(crate) struct CoreTrackerServices {
@@ -288,11 +287,12 @@ pub(crate) mod tests {
         let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
 
         let udp_core_broadcaster = Broadcaster::default();
-        let _core_repository = Arc::new(Repository::new());
         let core_keeper = Arc::new(Keeper::new(false, udp_core_broadcaster.clone()));
         let udp_core_stats_event_sender = core_keeper.sender();
 
-        let (server_keeper, _server_repository) = crate::statistics::setup::factory(false);
+        let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
+        let server_keeper = Arc::new(crate::statistics::keeper::Keeper::new(false, udp_server_broadcaster.clone()));
+
         let udp_server_stats_event_sender = server_keeper.sender();
 
         let announce_service = Arc::new(AnnounceService::new(

packages/udp-tracker-server/src/handlers/scrape.rs

@@ -94,11 +94,13 @@ mod tests {
         use bittorrent_udp_tracker_core::connection_cookie::{gen_remote_fingerprint, make};
         use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
 
+        use crate::event::sender::Broadcaster;
         use crate::handlers::handle_scrape;
         use crate::handlers::tests::{
             initialize_core_tracker_services_for_public_tracker, sample_cookie_valid_range, sample_ipv4_remote_addr,
             sample_issue_time, CoreTrackerServices, CoreUdpTrackerServices, TorrentPeerBuilder,
         };
+        use crate::statistics::keeper::Keeper;
 
         fn zeroed_torrent_statistics() -> TorrentScrapeStatistics {
             TorrentScrapeStatistics {
@@ -178,7 +180,9 @@ mod tests {
             core_tracker_services: Arc<CoreTrackerServices>,
             core_udp_tracker_services: Arc<CoreUdpTrackerServices>,
         ) -> Response {
-            let (keeper, _repository) = crate::statistics::setup::factory(false);
+            let udp_server_broadcaster = Broadcaster::default();
+            let keeper = Arc::new(Keeper::new(false, udp_server_broadcaster.clone()));
+
             let udp_server_stats_event_sender = keeper.sender();
 
             let client_socket_addr = sample_ipv4_remote_addr();

packages/udp-tracker-server/src/statistics/mod.rs

@@ -3,7 +3,6 @@ pub mod keeper;
 pub mod metrics;
 pub mod repository;
 pub mod services;
-pub mod setup;
 
 use metrics::Metrics;
 use torrust_tracker_metrics::metric::description::MetricDescription;

packages/udp-tracker-server/src/statistics/services.rs

@@ -113,8 +113,11 @@ mod tests {
     use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
     use torrust_tracker_test_helpers::configuration;
 
+    use crate::event::sender::Broadcaster;
+    use crate::statistics::describe_metrics;
+    use crate::statistics::keeper::Keeper;
+    use crate::statistics::repository::Repository;
     use crate::statistics::services::{get_metrics, TrackerMetrics};
-    use crate::statistics::{self, describe_metrics};
 
     pub fn tracker_configuration() -> Configuration {
         configuration::ephemeral()
@@ -127,7 +130,12 @@ mod tests {
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
         let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
 
-        let (_keeper, stats_repository) = statistics::setup::factory(config.core.tracker_usage_statistics);
+        let udp_server_broadcaster = Broadcaster::default();
+        let stats_repository = Arc::new(Repository::new());
+        let _keeper = Arc::new(Keeper::new(
+            config.core.tracker_usage_statistics,
+            udp_server_broadcaster.clone(),
+        ));
 
         let tracker_metrics = get_metrics(
             in_memory_torrent_repository.clone(),