refactor: encapsule field TrackerCoreContainer in HttpTrackerCoreContainer

Author: josecelano

packages/axum-http-tracker-server/src/server.rs

@@ -241,15 +241,7 @@ mod tests {
     use bittorrent_http_tracker_core::container::HttpTrackerCoreContainer;
     use bittorrent_http_tracker_core::services::announce::AnnounceService;
     use bittorrent_http_tracker_core::services::scrape::ScrapeService;
-    use bittorrent_tracker_core::announce_handler::AnnounceHandler;
-    use bittorrent_tracker_core::authentication::key::repository::in_memory::InMemoryKeyRepository;
-    use bittorrent_tracker_core::authentication::service;
-    use bittorrent_tracker_core::databases::setup::initialize_database;
-    use bittorrent_tracker_core::scrape_handler::ScrapeHandler;
-    use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-    use bittorrent_tracker_core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
-    use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
-    use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
+    use bittorrent_tracker_core::container::TrackerCoreContainer;
     use torrust_axum_server::tsl::make_rust_tls;
     use torrust_server_lib::registar::Registar;
     use torrust_tracker_configuration::{logging, Configuration};
@@ -275,48 +267,25 @@ mod tests {
         let http_stats_event_sender = Arc::new(http_stats_event_sender);
         let http_stats_repository = Arc::new(http_stats_repository);
 
-        let database = initialize_database(&configuration.core);
-        let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
-        let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&configuration.core, &in_memory_whitelist.clone()));
-        let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
-        let authentication_service = Arc::new(service::AuthenticationService::new(
-            &configuration.core,
-            &in_memory_key_repository,
-        ));
-        let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
-
-        let announce_handler = Arc::new(AnnounceHandler::new(
-            &configuration.core,
-            &whitelist_authorization,
-            &in_memory_torrent_repository,
-            &db_torrent_repository,
-        ));
-
-        let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
 
         let announce_service = Arc::new(AnnounceService::new(
-            core_config.clone(),
-            announce_handler.clone(),
-            authentication_service.clone(),
-            whitelist_authorization.clone(),
+            tracker_core_container.core_config.clone(),
+            tracker_core_container.announce_handler.clone(),
+            tracker_core_container.authentication_service.clone(),
+            tracker_core_container.whitelist_authorization.clone(),
             http_stats_event_sender.clone(),
         ));
 
         let scrape_service = Arc::new(ScrapeService::new(
-            core_config.clone(),
-            scrape_handler.clone(),
-            authentication_service.clone(),
+            tracker_core_container.core_config.clone(),
+            tracker_core_container.scrape_handler.clone(),
+            tracker_core_container.authentication_service.clone(),
             http_stats_event_sender.clone(),
         ));
 
         HttpTrackerCoreContainer {
-            core_config,
-            announce_handler,
-            scrape_handler,
-            whitelist_authorization,
-            authentication_service,
-
+            tracker_core_container,
             http_tracker_config,
             http_stats_event_sender,
             http_stats_repository,

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

@@ -1,24 +1,14 @@
 use std::sync::Arc;
 
-use bittorrent_tracker_core::announce_handler::AnnounceHandler;
-use bittorrent_tracker_core::authentication::service::AuthenticationService;
 use bittorrent_tracker_core::container::TrackerCoreContainer;
-use bittorrent_tracker_core::scrape_handler::ScrapeHandler;
-use bittorrent_tracker_core::whitelist;
 use torrust_tracker_configuration::{Core, HttpTracker};
 
 use crate::services::announce::AnnounceService;
 use crate::services::scrape::ScrapeService;
 use crate::{event, statistics};
 
 pub struct HttpTrackerCoreContainer {
-    // 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 authentication_service: Arc<AuthenticationService>,
-
+    pub tracker_core_container: Arc<TrackerCoreContainer>,
     pub http_tracker_config: Arc<HttpTracker>,
     pub http_stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
     pub http_stats_repository: Arc<statistics::repository::Repository>,
@@ -59,12 +49,7 @@ impl HttpTrackerCoreContainer {
         ));
 
         Arc::new(Self {
-            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(),
-            authentication_service: tracker_core_container.authentication_service.clone(),
-
+            tracker_core_container: tracker_core_container.clone(),
             http_tracker_config: http_tracker_config.clone(),
             http_stats_event_sender: http_stats_event_sender.clone(),
             http_stats_repository: http_stats_repository.clone(),

src/container.rs

@@ -25,7 +25,7 @@ use tracing::instrument;
 */
 
 pub struct AppContainer {
-    pub tracker_core_container: TrackerCoreContainer,
+    pub tracker_core_container: Arc<TrackerCoreContainer>,
 
     // UDP Tracker Core Services
     pub udp_core_stats_event_sender: Arc<Option<Box<dyn bittorrent_udp_tracker_core::event::sender::Sender>>>,
@@ -51,7 +51,7 @@ impl AppContainer {
     pub fn initialize(configuration: &Configuration) -> AppContainer {
         let core_config = Arc::new(configuration.core.clone());
 
-        let tracker_core_container = TrackerCoreContainer::initialize(&core_config);
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
 
         // HTTP Tracker Core Services
         let (http_stats_event_sender, http_stats_repository) =
@@ -123,12 +123,7 @@ impl AppContainer {
     #[must_use]
     pub fn http_tracker_container(&self, http_tracker_config: &Arc<HttpTracker>) -> HttpTrackerCoreContainer {
         HttpTrackerCoreContainer {
-            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(),
-            authentication_service: self.tracker_core_container.authentication_service.clone(),
-
+            tracker_core_container: self.tracker_core_container.clone(),
             http_tracker_config: http_tracker_config.clone(),
             http_stats_event_sender: self.http_stats_event_sender.clone(),
             http_stats_repository: self.http_stats_repository.clone(),