refactor: [torrust#1187] inline fn initialize_tracker

Author: josecelano

src/bootstrap/app.rs

@@ -25,7 +25,6 @@ use crate::container::AppContainer;
 use crate::core::databases::Database;
 use crate::core::services::{initialize_database, initialize_whitelist, statistics, tracker_factory};
 use crate::core::whitelist::WhiteListManager;
-use crate::core::Tracker;
 use crate::servers::udp::server::banning::BanService;
 use crate::servers::udp::server::launcher::MAX_CONNECTION_ID_ERRORS_PER_IP;
 use crate::shared::crypto::ephemeral_instance_keys;
@@ -82,10 +81,10 @@ pub fn initialize_app_container(configuration: &Configuration) -> AppContainer {
     let (stats_event_sender, stats_repository) = statistics::setup::factory(configuration.core.tracker_usage_statistics);
     let stats_event_sender = Arc::new(stats_event_sender);
     let stats_repository = Arc::new(stats_repository);
-
     let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
-
-    let tracker = Arc::new(initialize_tracker(configuration));
+    let database = initialize_database(configuration);
+    let whitelist_manager = initialize_whitelist(database.clone());
+    let tracker = Arc::new(tracker_factory(configuration, &database, &whitelist_manager));
 
     AppContainer {
         tracker,
@@ -116,18 +115,6 @@ pub fn initialize_static() {
     lazy_static::initialize(&ephemeral_instance_keys::ZEROED_TEST_CIPHER_BLOWFISH);
 }
 
-/// It builds the domain tracker
-///
-/// The tracker is the domain layer service. It's the entrypoint to make requests to the domain layer.
-/// It's used by other higher-level components like the UDP and HTTP trackers or the tracker API.
-#[must_use]
-#[instrument(skip(config))]
-pub fn initialize_tracker(config: &Configuration) -> Tracker {
-    let (database, whitelist_manager) = initialize_tracker_dependencies(config);
-
-    tracker_factory(config, &database, &whitelist_manager)
-}
-
 #[allow(clippy::type_complexity)]
 #[must_use]
 pub fn initialize_tracker_dependencies(config: &Configuration) -> (Arc<Box<dyn Database>>, Arc<WhiteListManager>) {

src/bootstrap/jobs/http_tracker.rs

@@ -86,9 +86,9 @@ mod tests {
 
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
-    use crate::bootstrap::app::{initialize_global_services, initialize_tracker};
+    use crate::bootstrap::app::initialize_global_services;
     use crate::bootstrap::jobs::http_tracker::start_job;
-    use crate::core::services::statistics;
+    use crate::core::services::{initialize_database, initialize_whitelist, statistics, tracker_factory};
     use crate::servers::http::Version;
     use crate::servers::registar::Registar;
 
@@ -102,7 +102,10 @@ mod tests {
         let stats_event_sender = Arc::new(stats_event_sender);
 
         initialize_global_services(&cfg);
-        let tracker = Arc::new(initialize_tracker(&cfg));
+
+        let database = initialize_database(&cfg);
+        let whitelist_manager = initialize_whitelist(database.clone());
+        let tracker = Arc::new(tracker_factory(&cfg, &database, &whitelist_manager));
 
         let version = Version::V1;
 

src/bootstrap/jobs/tracker_apis.rs

@@ -140,9 +140,9 @@ mod tests {
     use tokio::sync::RwLock;
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
-    use crate::bootstrap::app::{initialize_global_services, initialize_tracker};
+    use crate::bootstrap::app::initialize_global_services;
     use crate::bootstrap::jobs::tracker_apis::start_job;
-    use crate::core::services::statistics;
+    use crate::core::services::{initialize_database, initialize_whitelist, statistics, tracker_factory};
     use crate::servers::apis::Version;
     use crate::servers::registar::Registar;
     use crate::servers::udp::server::banning::BanService;
@@ -159,7 +159,10 @@ mod tests {
         let stats_repository = Arc::new(stats_repository);
 
         initialize_global_services(&cfg);
-        let tracker = Arc::new(initialize_tracker(&cfg));
+
+        let database = initialize_database(&cfg);
+        let whitelist_manager = initialize_whitelist(database.clone());
+        let tracker = Arc::new(tracker_factory(&cfg, &database, &whitelist_manager));
 
         let version = Version::V1;
 

src/servers/apis/server.rs

@@ -333,9 +333,9 @@ mod tests {
     use tokio::sync::RwLock;
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
-    use crate::bootstrap::app::{initialize_global_services, initialize_tracker};
+    use crate::bootstrap::app::initialize_global_services;
     use crate::bootstrap::jobs::make_rust_tls;
-    use crate::core::services::statistics;
+    use crate::core::services::{initialize_database, initialize_whitelist, statistics, tracker_factory};
     use crate::servers::apis::server::{ApiServer, Launcher};
     use crate::servers::registar::Registar;
     use crate::servers::udp::server::banning::BanService;
@@ -352,7 +352,10 @@ mod tests {
         let stats_repository = Arc::new(stats_repository);
 
         initialize_global_services(&cfg);
-        let tracker = Arc::new(initialize_tracker(&cfg));
+
+        let database = initialize_database(&cfg);
+        let whitelist_manager = initialize_whitelist(database.clone());
+        let tracker = Arc::new(tracker_factory(&cfg, &database, &whitelist_manager));
 
         let bind_to = config.bind_address;
 

src/servers/http/server.rs

@@ -242,9 +242,9 @@ mod tests {
 
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
-    use crate::bootstrap::app::{initialize_global_services, initialize_tracker};
+    use crate::bootstrap::app::initialize_global_services;
     use crate::bootstrap::jobs::make_rust_tls;
-    use crate::core::services::statistics;
+    use crate::core::services::{initialize_database, initialize_whitelist, statistics, tracker_factory};
     use crate::servers::http::server::{HttpServer, Launcher};
     use crate::servers::registar::Registar;
 
@@ -256,7 +256,10 @@ mod tests {
         let stats_event_sender = Arc::new(stats_event_sender);
 
         initialize_global_services(&cfg);
-        let tracker = Arc::new(initialize_tracker(&cfg));
+
+        let database = initialize_database(&cfg);
+        let whitelist_manager = initialize_whitelist(database.clone());
+        let tracker = Arc::new(tracker_factory(&cfg, &database, &whitelist_manager));
 
         let http_trackers = cfg.http_trackers.clone().expect("missing HTTP trackers configuration");
         let config = &http_trackers[0];

src/servers/udp/server/mod.rs

@@ -63,8 +63,8 @@ mod tests {
 
     use super::spawner::Spawner;
     use super::Server;
-    use crate::bootstrap::app::{initialize_global_services, initialize_tracker};
-    use crate::core::services::statistics;
+    use crate::bootstrap::app::initialize_global_services;
+    use crate::core::services::{initialize_database, initialize_whitelist, statistics, tracker_factory};
     use crate::servers::registar::Registar;
     use crate::servers::udp::server::banning::BanService;
     use crate::servers::udp::server::launcher::MAX_CONNECTION_ID_ERRORS_PER_IP;
@@ -78,7 +78,10 @@ mod tests {
         let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
 
         initialize_global_services(&cfg);
-        let tracker = Arc::new(initialize_tracker(&cfg));
+
+        let database = initialize_database(&cfg);
+        let whitelist_manager = initialize_whitelist(database.clone());
+        let tracker = Arc::new(tracker_factory(&cfg, &database, &whitelist_manager));
 
         let udp_trackers = cfg.udp_trackers.clone().expect("missing UDP trackers configuration");
         let config = &udp_trackers[0];
@@ -114,7 +117,10 @@ mod tests {
         let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
 
         initialize_global_services(&cfg);
-        let tracker = Arc::new(initialize_tracker(&cfg));
+
+        let database = initialize_database(&cfg);
+        let whitelist_manager = initialize_whitelist(database.clone());
+        let tracker = Arc::new(tracker_factory(&cfg, &database, &whitelist_manager));
 
         let config = &cfg.udp_trackers.as_ref().unwrap().first().unwrap();
         let bind_to = config.bind_address;

tests/servers/api/environment.rs

@@ -6,9 +6,9 @@ use futures::executor::block_on;
 use tokio::sync::RwLock;
 use torrust_tracker_api_client::connection_info::{ConnectionInfo, Origin};
 use torrust_tracker_configuration::{Configuration, HttpApi};
-use torrust_tracker_lib::bootstrap::app::{initialize_global_services, initialize_tracker};
+use torrust_tracker_lib::bootstrap::app::initialize_global_services;
 use torrust_tracker_lib::bootstrap::jobs::make_rust_tls;
-use torrust_tracker_lib::core::services::statistics;
+use torrust_tracker_lib::core::services::{initialize_database, initialize_whitelist, statistics, tracker_factory};
 use torrust_tracker_lib::core::statistics::event::sender::Sender;
 use torrust_tracker_lib::core::statistics::repository::Repository;
 use torrust_tracker_lib::core::whitelist::WhiteListManager;
@@ -51,10 +51,10 @@ impl Environment<Stopped> {
         let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
 
         initialize_global_services(configuration);
-        let tracker = Arc::new(initialize_tracker(configuration));
 
-        // todo: instantiate outside of `initialize_tracker_dependencies`
-        let whitelist_manager = tracker.whitelist_manager.clone();
+        let database = initialize_database(configuration);
+        let whitelist_manager = initialize_whitelist(database.clone());
+        let tracker = Arc::new(tracker_factory(configuration, &database, &whitelist_manager));
 
         let config = Arc::new(configuration.http_api.clone().expect("missing API configuration"));
 

tests/servers/http/environment.rs

@@ -3,9 +3,9 @@ use std::sync::Arc;
 use bittorrent_primitives::info_hash::InfoHash;
 use futures::executor::block_on;
 use torrust_tracker_configuration::{Configuration, HttpTracker};
-use torrust_tracker_lib::bootstrap::app::{initialize_global_services, initialize_tracker};
+use torrust_tracker_lib::bootstrap::app::initialize_global_services;
 use torrust_tracker_lib::bootstrap::jobs::make_rust_tls;
-use torrust_tracker_lib::core::services::statistics;
+use torrust_tracker_lib::core::services::{initialize_database, initialize_whitelist, statistics, tracker_factory};
 use torrust_tracker_lib::core::statistics::event::sender::Sender;
 use torrust_tracker_lib::core::statistics::repository::Repository;
 use torrust_tracker_lib::core::whitelist::WhiteListManager;
@@ -39,10 +39,10 @@ impl Environment<Stopped> {
         let stats_repository = Arc::new(stats_repository);
 
         initialize_global_services(configuration);
-        let tracker = Arc::new(initialize_tracker(configuration));
 
-        // todo: instantiate outside of `initialize_tracker_dependencies`
-        let whitelist_manager = tracker.whitelist_manager.clone();
+        let database = initialize_database(configuration);
+        let whitelist_manager = initialize_whitelist(database.clone());
+        let tracker = Arc::new(tracker_factory(configuration, &database, &whitelist_manager));
 
         let http_tracker = configuration
             .http_trackers

tests/servers/udp/environment.rs

@@ -4,8 +4,8 @@ use std::sync::Arc;
 use bittorrent_primitives::info_hash::InfoHash;
 use tokio::sync::RwLock;
 use torrust_tracker_configuration::{Configuration, UdpTracker, DEFAULT_TIMEOUT};
-use torrust_tracker_lib::bootstrap::app::{initialize_global_services, initialize_tracker};
-use torrust_tracker_lib::core::services::statistics;
+use torrust_tracker_lib::bootstrap::app::initialize_global_services;
+use torrust_tracker_lib::core::services::{initialize_database, initialize_whitelist, statistics, tracker_factory};
 use torrust_tracker_lib::core::statistics::event::sender::Sender;
 use torrust_tracker_lib::core::statistics::repository::Repository;
 use torrust_tracker_lib::core::Tracker;
@@ -50,7 +50,10 @@ impl Environment<Stopped> {
         let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
 
         initialize_global_services(configuration);
-        let tracker = Arc::new(initialize_tracker(configuration));
+
+        let database = initialize_database(configuration);
+        let whitelist_manager = initialize_whitelist(database.clone());
+        let tracker = Arc::new(tracker_factory(configuration, &database, &whitelist_manager));
 
         let udp_tracker = configuration.udp_trackers.clone().expect("missing UDP tracker configuration");