refactor: rename AppContainer fields

Author: josecelano

src/container.rs

@@ -24,6 +24,18 @@ use torrust_tracker_configuration::{Configuration, Core, HttpApi, HttpTracker, U
 use torrust_udp_tracker_server::container::UdpTrackerServerContainer;
 use tracing::instrument;
 
+/* todo: remove duplicate code.
+
+   Use containers from packages as AppContainer fields:
+
+   - bittorrent_tracker_core::container::TrackerCoreContainer
+   - bittorrent_udp_tracker_core::container::UdpTrackerCoreContainer
+   - bittorrent_http_tracker_core::container::HttpTrackerCoreContainer
+   - torrust_udp_tracker_server::container::UdpTrackerServerContainer
+
+   Container initialization is duplicated.
+*/
+
 pub struct AppContainer {
     // Tracker Core Services
     pub core_config: Arc<Core>,
@@ -42,10 +54,10 @@ pub struct AppContainer {
     // UDP Tracker Core Services
     pub udp_core_stats_event_sender: Arc<Option<Box<dyn bittorrent_udp_tracker_core::statistics::event::sender::Sender>>>,
     pub udp_core_stats_repository: Arc<bittorrent_udp_tracker_core::statistics::repository::Repository>,
-    pub ban_service: Arc<RwLock<BanService>>,
-    pub connect_service: Arc<bittorrent_udp_tracker_core::services::connect::ConnectService>,
-    pub announce_service: Arc<bittorrent_udp_tracker_core::services::announce::AnnounceService>,
-    pub scrape_service: Arc<bittorrent_udp_tracker_core::services::scrape::ScrapeService>,
+    pub udp_ban_service: Arc<RwLock<BanService>>,
+    pub udp_connect_service: Arc<bittorrent_udp_tracker_core::services::connect::ConnectService>,
+    pub udp_announce_service: Arc<bittorrent_udp_tracker_core::services::announce::AnnounceService>,
+    pub udp_scrape_service: Arc<bittorrent_udp_tracker_core::services::scrape::ScrapeService>,
 
     // HTTP Tracker Core Services
     pub http_stats_event_sender: Arc<Option<Box<dyn bittorrent_http_tracker_core::statistics::event::sender::Sender>>>,
@@ -89,16 +101,16 @@ impl AppContainer {
             bittorrent_udp_tracker_core::statistics::setup::factory(configuration.core.tracker_usage_statistics);
         let udp_core_stats_event_sender = Arc::new(udp_core_stats_event_sender);
         let udp_core_stats_repository = Arc::new(udp_core_stats_repository);
-        let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
-        let connect_service = Arc::new(bittorrent_udp_tracker_core::services::connect::ConnectService::new(
+        let udp_ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
+        let udp_connect_service = Arc::new(bittorrent_udp_tracker_core::services::connect::ConnectService::new(
             udp_core_stats_event_sender.clone(),
         ));
-        let announce_service = Arc::new(bittorrent_udp_tracker_core::services::announce::AnnounceService::new(
+        let udp_announce_service = Arc::new(bittorrent_udp_tracker_core::services::announce::AnnounceService::new(
             tracker_core_container.announce_handler.clone(),
             tracker_core_container.whitelist_authorization.clone(),
             udp_core_stats_event_sender.clone(),
         ));
-        let scrape_service = Arc::new(bittorrent_udp_tracker_core::services::scrape::ScrapeService::new(
+        let udp_scrape_service = Arc::new(bittorrent_udp_tracker_core::services::scrape::ScrapeService::new(
             tracker_core_container.scrape_handler.clone(),
             udp_core_stats_event_sender.clone(),
         ));
@@ -127,10 +139,10 @@ impl AppContainer {
             // UDP Tracker Core Services
             udp_core_stats_event_sender,
             udp_core_stats_repository,
-            ban_service,
-            connect_service,
-            announce_service,
-            scrape_service,
+            udp_ban_service,
+            udp_connect_service,
+            udp_announce_service,
+            udp_scrape_service,
 
             // HTTP Tracker Core Services
             http_stats_event_sender,
@@ -172,10 +184,10 @@ impl AppContainer {
             udp_tracker_config: udp_tracker_config.clone(),
             udp_core_stats_event_sender: self.udp_core_stats_event_sender.clone(),
             udp_core_stats_repository: self.udp_core_stats_repository.clone(),
-            ban_service: self.ban_service.clone(),
-            connect_service: self.connect_service.clone(),
-            announce_service: self.announce_service.clone(),
-            scrape_service: self.scrape_service.clone(),
+            ban_service: self.udp_ban_service.clone(),
+            connect_service: self.udp_connect_service.clone(),
+            announce_service: self.udp_announce_service.clone(),
+            scrape_service: self.udp_scrape_service.clone(),
         }
     }
 
@@ -187,7 +199,7 @@ impl AppContainer {
             in_memory_torrent_repository: self.in_memory_torrent_repository.clone(),
             keys_handler: self.keys_handler.clone(),
             whitelist_manager: self.whitelist_manager.clone(),
-            ban_service: self.ban_service.clone(),
+            ban_service: self.udp_ban_service.clone(),
             http_stats_repository: self.http_stats_repository.clone(),
             udp_core_stats_repository: self.udp_core_stats_repository.clone(),
             udp_server_stats_repository: self.udp_server_stats_repository.clone(),