Merge #1216: Overhaul core Tracker: remove complexity (type_complexity)

8f02fb9 refactor: [#1215] instantiate only needed services (Jose Celano)

Pull request description:

  Overhaul core Tracker: remove complexity.

ACKs for top commit:
  josecelano:
    ACK 8f02fb9

Tree-SHA512: a2878294aaa7ce9f33c7a945c4aa737035e5c030d9610632cc2fd4e1819284680c619d87180356ec71c28ccc1b71969efae958f9120a3aab426f7aa853c08680

Author: josecelano

src/app_test.rs

@@ -117,8 +117,8 @@ mod tests {
     use torrust_tracker_primitives::torrent_metrics::TorrentsMetrics;
     use torrust_tracker_test_helpers::configuration;
 
-    use crate::app_test::initialize_tracker_dependencies;
     use crate::core::services::statistics::{self, get_metrics, TrackerMetrics};
+    use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
     use crate::core::{self};
     use crate::servers::udp::server::banning::BanService;
     use crate::servers::udp::server::launcher::MAX_CONNECTION_ID_ERRORS_PER_IP;
@@ -131,19 +131,9 @@ mod tests {
     async fn the_statistics_service_should_return_the_tracker_metrics() {
         let config = tracker_configuration();
 
-        let (
-            _database,
-            _in_memory_whitelist,
-            _whitelist_authorization,
-            _authentication_service,
-            in_memory_torrent_repository,
-            _db_torrent_repository,
-            _torrents_manager,
-        ) = initialize_tracker_dependencies(&config);
-
+        let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
         let (_stats_event_sender, stats_repository) = statistics::setup::factory(config.core.tracker_usage_statistics);
         let stats_repository = Arc::new(stats_repository);
-
         let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
 
         let tracker_metrics = get_metrics(

src/core/services/statistics/mod.rs

@@ -112,29 +112,10 @@ pub async fn get_torrents(
 #[cfg(test)]
 mod tests {
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-    use std::sync::Arc;
 
     use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
-    use torrust_tracker_configuration::Configuration;
     use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
 
-    use crate::app_test::initialize_tracker_dependencies;
-    use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
-
-    fn initialize_in_memory_torrent_repository(config: &Configuration) -> Arc<InMemoryTorrentRepository> {
-        let (
-            _database,
-            _in_memory_whitelist,
-            _whitelist_authorization,
-            _authentication_service,
-            in_memory_torrent_repository,
-            _db_torrent_repository,
-            _torrents_manager,
-        ) = initialize_tracker_dependencies(config);
-
-        in_memory_torrent_repository
-    }
-
     fn sample_peer() -> peer::Peer {
         peer::Peer {
             peer_id: PeerId(*b"-qB00000000000000000"),
@@ -153,17 +134,11 @@ mod tests {
         use std::sync::Arc;
 
         use bittorrent_primitives::info_hash::InfoHash;
-        use torrust_tracker_configuration::Configuration;
-        use torrust_tracker_test_helpers::configuration;
 
-        use crate::core::services::torrent::tests::{initialize_in_memory_torrent_repository, sample_peer};
+        use crate::core::services::torrent::tests::sample_peer;
         use crate::core::services::torrent::{get_torrent_info, Info};
         use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
 
-        pub fn tracker_configuration() -> Configuration {
-            configuration::ephemeral()
-        }
-
         #[tokio::test]
         async fn should_return_none_if_the_tracker_does_not_have_the_torrent() {
             let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
@@ -179,9 +154,7 @@ mod tests {
 
         #[tokio::test]
         async fn should_return_the_torrent_info_if_the_tracker_has_the_torrent() {
-            let config = tracker_configuration();
-
-            let in_memory_torrent_repository = initialize_in_memory_torrent_repository(&config);
+            let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
 
             let hash = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned();
             let info_hash = InfoHash::from_str(&hash).unwrap();
@@ -210,17 +183,11 @@ mod tests {
         use std::sync::Arc;
 
         use bittorrent_primitives::info_hash::InfoHash;
-        use torrust_tracker_configuration::Configuration;
-        use torrust_tracker_test_helpers::configuration;
 
-        use crate::core::services::torrent::tests::{initialize_in_memory_torrent_repository, sample_peer};
+        use crate::core::services::torrent::tests::sample_peer;
         use crate::core::services::torrent::{get_torrents_page, BasicInfo, Pagination};
         use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
 
-        pub fn tracker_configuration() -> Configuration {
-            configuration::ephemeral()
-        }
-
         #[tokio::test]
         async fn should_return_an_empty_result_if_the_tracker_does_not_have_any_torrent() {
             let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
@@ -232,9 +199,7 @@ mod tests {
 
         #[tokio::test]
         async fn should_return_a_summarized_info_for_all_torrents() {
-            let config = tracker_configuration();
-
-            let in_memory_torrent_repository = initialize_in_memory_torrent_repository(&config);
+            let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
 
             let hash = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned();
             let info_hash = InfoHash::from_str(&hash).unwrap();
@@ -256,9 +221,7 @@ mod tests {
 
         #[tokio::test]
         async fn should_allow_limiting_the_number_of_torrents_in_the_result() {
-            let config = tracker_configuration();
-
-            let in_memory_torrent_repository = initialize_in_memory_torrent_repository(&config);
+            let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
 
             let hash1 = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned();
             let info_hash1 = InfoHash::from_str(&hash1).unwrap();
@@ -279,9 +242,7 @@ mod tests {
 
         #[tokio::test]
         async fn should_allow_using_pagination_in_the_result() {
-            let config = tracker_configuration();
-
-            let in_memory_torrent_repository = initialize_in_memory_torrent_repository(&config);
+            let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
 
             let hash1 = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned();
             let info_hash1 = InfoHash::from_str(&hash1).unwrap();
@@ -311,9 +272,7 @@ mod tests {
 
         #[tokio::test]
         async fn should_return_torrents_ordered_by_info_hash() {
-            let config = tracker_configuration();
-
-            let in_memory_torrent_repository = initialize_in_memory_torrent_repository(&config);
+            let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
 
             let hash1 = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned();
             let info_hash1 = InfoHash::from_str(&hash1).unwrap();

src/core/services/torrent.rs

@@ -491,7 +491,6 @@
 use torrust_tracker_clock::clock;
 
 pub mod app;
-pub mod app_test;
 pub mod bootstrap;
 pub mod console;
 pub mod container;