refactor: encapsule fiel in AppContainer for TrackerCoreContainer

Author: josecelano

src/app.rs

@@ -53,6 +53,7 @@ pub async fn start(config: &Configuration, app_container: &Arc<AppContainer>) ->
     // Load peer keys
     if config.core.private {
         app_container
+            .tracker_core_container
             .keys_handler
             .load_peer_keys_from_database()
             .await
@@ -62,6 +63,7 @@ pub async fn start(config: &Configuration, app_container: &Arc<AppContainer>) ->
     // Load whitelisted torrents
     if config.core.listed {
         app_container
+            .tracker_core_container
             .whitelist_manager
             .load_whitelist_from_database()
             .await
@@ -130,7 +132,10 @@ pub async fn start(config: &Configuration, app_container: &Arc<AppContainer>) ->
 
     // Start runners to remove torrents without peers, every interval
     if config.core.inactive_peer_cleanup_interval > 0 {
-        jobs.push(torrent_cleanup::start_job(&config.core, &app_container.torrents_manager));
+        jobs.push(torrent_cleanup::start_job(
+            &config.core,
+            &app_container.tracker_core_container.torrents_manager,
+        ));
     }
 
     // Start Health Check API

src/container.rs

@@ -3,32 +3,20 @@ use std::sync::Arc;
 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::handler::KeysHandler;
-use bittorrent_tracker_core::authentication::service::AuthenticationService;
 use bittorrent_tracker_core::container::TrackerCoreContainer;
-use bittorrent_tracker_core::databases::Database;
-use bittorrent_tracker_core::scrape_handler::ScrapeHandler;
-use bittorrent_tracker_core::torrent::manager::TorrentsManager;
-use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use bittorrent_tracker_core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
-use bittorrent_tracker_core::whitelist;
-use bittorrent_tracker_core::whitelist::manager::WhitelistManager;
-use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
 use bittorrent_udp_tracker_core::container::UdpTrackerCoreContainer;
 use bittorrent_udp_tracker_core::services::banning::BanService;
 use bittorrent_udp_tracker_core::{self, MAX_CONNECTION_ID_ERRORS_PER_IP};
 use tokio::sync::RwLock;
 use torrust_rest_tracker_api_core::container::TrackerHttpApiCoreContainer;
-use torrust_tracker_configuration::{Configuration, Core, HttpApi, HttpTracker, UdpTracker};
+use torrust_tracker_configuration::{Configuration, HttpApi, HttpTracker, UdpTracker};
 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
@@ -37,19 +25,7 @@ use tracing::instrument;
 */
 
 pub struct AppContainer {
-    // Tracker Core Services
-    pub core_config: Arc<Core>,
-    pub database: Arc<Box<dyn Database>>,
-    pub announce_handler: Arc<AnnounceHandler>,
-    pub scrape_handler: Arc<ScrapeHandler>,
-    pub keys_handler: Arc<KeysHandler>,
-    pub authentication_service: Arc<AuthenticationService>,
-    pub in_memory_whitelist: Arc<InMemoryWhitelist>,
-    pub whitelist_authorization: Arc<whitelist::authorization::WhitelistAuthorization>,
-    pub whitelist_manager: Arc<WhitelistManager>,
-    pub in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
-    pub db_torrent_repository: Arc<DatabasePersistentTorrentRepository>,
-    pub torrents_manager: Arc<TorrentsManager>,
+    pub tracker_core_container: TrackerCoreContainer,
 
     // UDP Tracker Core Services
     pub udp_core_stats_event_sender: Arc<Option<Box<dyn bittorrent_udp_tracker_core::event::sender::Sender>>>,
@@ -122,19 +98,7 @@ impl AppContainer {
         let udp_server_stats_repository = Arc::new(udp_server_stats_repository);
 
         AppContainer {
-            // Tracker Core Services
-            core_config,
-            database: tracker_core_container.database,
-            announce_handler: tracker_core_container.announce_handler,
-            scrape_handler: tracker_core_container.scrape_handler,
-            keys_handler: tracker_core_container.keys_handler,
-            authentication_service: tracker_core_container.authentication_service,
-            in_memory_whitelist: tracker_core_container.in_memory_whitelist,
-            whitelist_authorization: tracker_core_container.whitelist_authorization,
-            whitelist_manager: tracker_core_container.whitelist_manager,
-            in_memory_torrent_repository: tracker_core_container.in_memory_torrent_repository,
-            db_torrent_repository: tracker_core_container.db_torrent_repository,
-            torrents_manager: tracker_core_container.torrents_manager,
+            tracker_core_container,
 
             // UDP Tracker Core Services
             udp_core_stats_event_sender,
@@ -159,11 +123,11 @@ impl AppContainer {
     #[must_use]
     pub fn http_tracker_container(&self, http_tracker_config: &Arc<HttpTracker>) -> HttpTrackerCoreContainer {
         HttpTrackerCoreContainer {
-            core_config: self.core_config.clone(),
-            announce_handler: self.announce_handler.clone(),
-            scrape_handler: self.scrape_handler.clone(),
-            whitelist_authorization: self.whitelist_authorization.clone(),
-            authentication_service: self.authentication_service.clone(),
+            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(),
 
             http_tracker_config: http_tracker_config.clone(),
             http_stats_event_sender: self.http_stats_event_sender.clone(),
@@ -176,10 +140,10 @@ impl AppContainer {
     #[must_use]
     pub fn udp_tracker_container(&self, udp_tracker_config: &Arc<UdpTracker>) -> UdpTrackerCoreContainer {
         UdpTrackerCoreContainer {
-            core_config: self.core_config.clone(),
-            announce_handler: self.announce_handler.clone(),
-            scrape_handler: self.scrape_handler.clone(),
-            whitelist_authorization: self.whitelist_authorization.clone(),
+            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(),
 
             udp_tracker_config: udp_tracker_config.clone(),
             udp_core_stats_event_sender: self.udp_core_stats_event_sender.clone(),
@@ -194,11 +158,12 @@ impl AppContainer {
     #[must_use]
     pub fn tracker_http_api_container(&self, http_api_config: &Arc<HttpApi>) -> TrackerHttpApiCoreContainer {
         TrackerHttpApiCoreContainer {
+            core_config: self.tracker_core_container.core_config.clone(),
+            in_memory_torrent_repository: self.tracker_core_container.in_memory_torrent_repository.clone(),
+            keys_handler: self.tracker_core_container.keys_handler.clone(),
+            whitelist_manager: self.tracker_core_container.whitelist_manager.clone(),
+
             http_api_config: http_api_config.clone(),
-            core_config: self.core_config.clone(),
-            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.udp_ban_service.clone(),
             http_stats_repository: self.http_stats_repository.clone(),
             udp_core_stats_repository: self.udp_core_stats_repository.clone(),