refactor: encapsule field TrackerCoreContainer in UdpTrackerCoreContainer

Author: josecelano

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

@@ -1,9 +1,6 @@
 use std::sync::Arc;
 
-use bittorrent_tracker_core::announce_handler::AnnounceHandler;
 use bittorrent_tracker_core::container::TrackerCoreContainer;
-use bittorrent_tracker_core::scrape_handler::ScrapeHandler;
-use bittorrent_tracker_core::whitelist;
 use tokio::sync::RwLock;
 use torrust_tracker_configuration::{Core, UdpTracker};
 
@@ -14,12 +11,7 @@ use crate::services::scrape::ScrapeService;
 use crate::{event, statistics, MAX_CONNECTION_ID_ERRORS_PER_IP};
 
 pub struct UdpTrackerCoreContainer {
-    // todo: replace with TrackerCoreContainer
-    pub core_config: Arc<Core>,
-    pub announce_handler: Arc<AnnounceHandler>,
-    pub scrape_handler: Arc<ScrapeHandler>,
-    pub whitelist_authorization: Arc<whitelist::authorization::WhitelistAuthorization>,
-
+    pub tracker_core_container: Arc<TrackerCoreContainer>,
     pub udp_tracker_config: Arc<UdpTracker>,
     pub udp_core_stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
     pub udp_core_stats_repository: Arc<statistics::repository::Repository>,
@@ -58,11 +50,7 @@ impl UdpTrackerCoreContainer {
         ));
 
         Arc::new(UdpTrackerCoreContainer {
-            core_config: tracker_core_container.core_config.clone(),
-            announce_handler: tracker_core_container.announce_handler.clone(),
-            scrape_handler: tracker_core_container.scrape_handler.clone(),
-            whitelist_authorization: tracker_core_container.whitelist_authorization.clone(),
-
+            tracker_core_container: tracker_core_container.clone(),
             udp_tracker_config: udp_tracker_config.clone(),
             udp_core_stats_event_sender: udp_core_stats_event_sender.clone(),
             udp_core_stats_repository: udp_core_stats_repository.clone(),

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

@@ -172,7 +172,7 @@ pub async fn handle_request(
                 client_socket_addr,
                 server_socket_addr,
                 &announce_request,
-                &udp_tracker_core_container.core_config,
+                &udp_tracker_core_container.tracker_core_container.core_config,
                 &udp_tracker_server_container.udp_server_stats_event_sender,
                 cookie_time_values.valid_range,
             )

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

@@ -47,7 +47,7 @@ impl Launcher {
     ) {
         tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Starting on: {bind_to}");
 
-        if udp_tracker_core_container.core_config.private {
+        if udp_tracker_core_container.tracker_core_container.core_config.private {
             tracing::error!("udp services cannot be used for private trackers");
             panic!("it should not use udp if using authentication");
         }

src/container.rs

@@ -135,11 +135,7 @@ impl AppContainer {
     #[must_use]
     pub fn udp_tracker_container(&self, udp_tracker_config: &Arc<UdpTracker>) -> UdpTrackerCoreContainer {
         UdpTrackerCoreContainer {
-            core_config: self.tracker_core_container.core_config.clone(),
-            announce_handler: self.tracker_core_container.announce_handler.clone(),
-            scrape_handler: self.tracker_core_container.scrape_handler.clone(),
-            whitelist_authorization: self.tracker_core_container.whitelist_authorization.clone(),
-
+            tracker_core_container: self.tracker_core_container.clone(),
             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(),