refactor: [#1203] use directly the InMemoryTorrentRepository

Author: josecelano

src/app.rs

@@ -118,7 +118,7 @@ pub async fn start(config: &Configuration, app_container: &AppContainer) -> Vec<
     if let Some(http_api_config) = &config.http_api {
         if let Some(job) = tracker_apis::start_job(
             http_api_config,
-            app_container.tracker.clone(),
+            app_container.in_memory_torrent_repository.clone(),
             app_container.keys_handler.clone(),
             app_container.whitelist_manager.clone(),
             app_container.ban_service.clone(),

src/bootstrap/jobs/tracker_apis.rs

@@ -33,8 +33,8 @@ use super::make_rust_tls;
 use crate::core::authentication::handler::KeysHandler;
 use crate::core::statistics::event::sender::Sender;
 use crate::core::statistics::repository::Repository;
+use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
 use crate::core::whitelist::manager::WhiteListManager;
-use crate::core::{self};
 use crate::servers::apis::server::{ApiServer, Launcher};
 use crate::servers::apis::Version;
 use crate::servers::registar::ServiceRegistrationForm;
@@ -63,7 +63,6 @@ pub struct ApiServerJobStarted();
 #[allow(clippy::too_many_arguments)]
 #[instrument(skip(
     config,
-    tracker,
     keys_handler,
     whitelist_manager,
     ban_service,
@@ -73,7 +72,7 @@ pub struct ApiServerJobStarted();
 ))]
 pub async fn start_job(
     config: &HttpApi,
-    tracker: Arc<core::Tracker>,
+    in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     keys_handler: Arc<KeysHandler>,
     whitelist_manager: Arc<WhiteListManager>,
     ban_service: Arc<RwLock<BanService>>,
@@ -95,7 +94,7 @@ pub async fn start_job(
             start_v1(
                 bind_to,
                 tls,
-                tracker.clone(),
+                in_memory_torrent_repository.clone(),
                 keys_handler.clone(),
                 whitelist_manager.clone(),
                 ban_service.clone(),
@@ -114,7 +113,6 @@ pub async fn start_job(
 #[instrument(skip(
     socket,
     tls,
-    tracker,
     keys_handler,
     whitelist_manager,
     ban_service,
@@ -126,7 +124,7 @@ pub async fn start_job(
 async fn start_v1(
     socket: SocketAddr,
     tls: Option<RustlsConfig>,
-    tracker: Arc<core::Tracker>,
+    in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     keys_handler: Arc<KeysHandler>,
     whitelist_manager: Arc<WhiteListManager>,
     ban_service: Arc<RwLock<BanService>>,
@@ -137,7 +135,7 @@ async fn start_v1(
 ) -> JoinHandle<()> {
     let server = ApiServer::new(Launcher::new(socket, tls))
         .start(
-            tracker,
+            in_memory_torrent_repository,
             keys_handler,
             whitelist_manager,
             stats_event_sender,
@@ -179,7 +177,7 @@ mod tests {
 
         start_job(
             config,
-            app_container.tracker,
+            app_container.in_memory_torrent_repository,
             app_container.keys_handler,
             app_container.whitelist_manager,
             app_container.ban_service,

src/core/services/statistics/mod.rs

@@ -45,7 +45,7 @@ use torrust_tracker_primitives::torrent_metrics::TorrentsMetrics;
 
 use crate::core::statistics::metrics::Metrics;
 use crate::core::statistics::repository::Repository;
-use crate::core::Tracker;
+use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
 use crate::servers::udp::server::banning::BanService;
 
 /// All the metrics collected by the tracker.
@@ -64,11 +64,11 @@ pub struct TrackerMetrics {
 
 /// It returns all the [`TrackerMetrics`]
 pub async fn get_metrics(
-    tracker: Arc<Tracker>,
+    in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     ban_service: Arc<RwLock<BanService>>,
     stats_repository: Arc<Repository>,
 ) -> TrackerMetrics {
-    let torrents_metrics = tracker.in_memory_torrent_repository.get_torrents_metrics();
+    let torrents_metrics = in_memory_torrent_repository.get_torrents_metrics();
     let stats = stats_repository.get_stats().await;
     let udp_banned_ips_total = ban_service.read().await.get_banned_ips_total();
 
@@ -145,7 +145,7 @@ mod tests {
         let (_stats_event_sender, stats_repository) = statistics::setup::factory(config.core.tracker_usage_statistics);
         let stats_repository = Arc::new(stats_repository);
 
-        let tracker = Arc::new(initialize_tracker(
+        let _tracker = Arc::new(initialize_tracker(
             &config,
             &whitelist_authorization,
             &in_memory_torrent_repository,
@@ -154,7 +154,12 @@ mod tests {
 
         let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
 
-        let tracker_metrics = get_metrics(tracker.clone(), ban_service.clone(), stats_repository.clone()).await;
+        let tracker_metrics = get_metrics(
+            in_memory_torrent_repository.clone(),
+            ban_service.clone(),
+            stats_repository.clone(),
+        )
+        .await;
 
         assert_eq!(
             tracker_metrics,

src/core/services/torrent.rs

@@ -11,7 +11,7 @@ use torrust_tracker_primitives::pagination::Pagination;
 use torrust_tracker_primitives::peer;
 use torrust_tracker_torrent_repository::entry::EntrySync;
 
-use crate::core::Tracker;
+use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
 
 /// It contains all the information the tracker has about a torrent
 #[derive(Debug, PartialEq)]
@@ -44,8 +44,11 @@ pub struct BasicInfo {
 }
 
 /// It returns all the information the tracker has about one torrent in a [Info] struct.
-pub async fn get_torrent_info(tracker: Arc<Tracker>, info_hash: &InfoHash) -> Option<Info> {
-    let torrent_entry_option = tracker.in_memory_torrent_repository.get(info_hash);
+pub async fn get_torrent_info(
+    in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
+    info_hash: &InfoHash,
+) -> Option<Info> {
+    let torrent_entry_option = in_memory_torrent_repository.get(info_hash);
 
     let torrent_entry = torrent_entry_option?;
 
@@ -65,10 +68,13 @@ pub async fn get_torrent_info(tracker: Arc<Tracker>, info_hash: &InfoHash) -> Op
 }
 
 /// It returns all the information the tracker has about multiple torrents in a [`BasicInfo`] struct, excluding the peer list.
-pub async fn get_torrents_page(tracker: Arc<Tracker>, pagination: Option<&Pagination>) -> Vec<BasicInfo> {
+pub async fn get_torrents_page(
+    in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
+    pagination: Option<&Pagination>,
+) -> Vec<BasicInfo> {
     let mut basic_infos: Vec<BasicInfo> = vec![];
 
-    for (info_hash, torrent_entry) in tracker.in_memory_torrent_repository.get_paginated(pagination) {
+    for (info_hash, torrent_entry) in in_memory_torrent_repository.get_paginated(pagination) {
         let stats = torrent_entry.get_swarm_metadata();
 
         basic_infos.push(BasicInfo {
@@ -83,15 +89,14 @@ pub async fn get_torrents_page(tracker: Arc<Tracker>, pagination: Option<&Pagina
 }
 
 /// It returns all the information the tracker has about multiple torrents in a [`BasicInfo`] struct, excluding the peer list.
-pub async fn get_torrents(tracker: Arc<Tracker>, info_hashes: &[InfoHash]) -> Vec<BasicInfo> {
+pub async fn get_torrents(
+    in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
+    info_hashes: &[InfoHash],
+) -> Vec<BasicInfo> {
     let mut basic_infos: Vec<BasicInfo> = vec![];
 
     for info_hash in info_hashes {
-        if let Some(stats) = tracker
-            .in_memory_torrent_repository
-            .get(info_hash)
-            .map(|t| t.get_swarm_metadata())
-        {
+        if let Some(stats) = in_memory_torrent_repository.get(info_hash).map(|t| t.get_swarm_metadata()) {
             basic_infos.push(BasicInfo {
                 info_hash: *info_hash,
                 seeders: u64::from(stats.complete),
@@ -115,9 +120,10 @@ mod tests {
 
     use crate::app_test::initialize_tracker_dependencies;
     use crate::core::services::initialize_tracker;
+    use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
     use crate::core::Tracker;
 
-    fn initialize_tracker_and_deps(config: &Configuration) -> Arc<Tracker> {
+    fn initialize_tracker_and_deps(config: &Configuration) -> (Arc<Tracker>, Arc<InMemoryTorrentRepository>) {
         let (
             _database,
             _in_memory_whitelist,
@@ -128,12 +134,14 @@ mod tests {
             _torrents_manager,
         ) = initialize_tracker_dependencies(config);
 
-        Arc::new(initialize_tracker(
+        let tracker = Arc::new(initialize_tracker(
             config,
             &whitelist_authorization,
             &in_memory_torrent_repository,
             &db_torrent_repository,
-        ))
+        ));
+
+        (tracker, in_memory_torrent_repository)
     }
 
     fn sample_peer() -> peer::Peer {
@@ -157,40 +165,20 @@ mod tests {
         use torrust_tracker_configuration::Configuration;
         use torrust_tracker_test_helpers::configuration;
 
-        use crate::app_test::initialize_tracker_dependencies;
-        use crate::core::services::initialize_tracker;
         use crate::core::services::torrent::tests::{initialize_tracker_and_deps, 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 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 tracker = initialize_tracker(
-                &config,
-                &whitelist_authorization,
-                &in_memory_torrent_repository,
-                &db_torrent_repository,
-            );
-
-            let tracker = Arc::new(tracker);
+            let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
 
             let torrent_info = get_torrent_info(
-                tracker.clone(),
+                in_memory_torrent_repository.clone(),
                 &InfoHash::from_str("0b3aea4adc213ce32295be85d3883a63bca25446").unwrap(),
             )
             .await;
@@ -202,13 +190,15 @@ mod tests {
         async fn should_return_the_torrent_info_if_the_tracker_has_the_torrent() {
             let config = tracker_configuration();
 
-            let tracker = initialize_tracker_and_deps(&config);
+            let (tracker, in_memory_torrent_repository) = initialize_tracker_and_deps(&config);
 
             let hash = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned();
             let info_hash = InfoHash::from_str(&hash).unwrap();
             let _ = tracker.upsert_peer_and_get_stats(&info_hash, &sample_peer());
 
-            let torrent_info = get_torrent_info(tracker.clone(), &info_hash).await.unwrap();
+            let torrent_info = get_torrent_info(in_memory_torrent_repository.clone(), &info_hash)
+                .await
+                .unwrap();
 
             assert_eq!(
                 torrent_info,
@@ -226,25 +216,25 @@ mod tests {
     mod searching_for_torrents {
 
         use std::str::FromStr;
+        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_tracker_and_deps, 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 config = tracker_configuration();
-
-            let tracker = initialize_tracker_and_deps(&config);
+            let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
 
-            let torrents = get_torrents_page(tracker.clone(), Some(&Pagination::default())).await;
+            let torrents = get_torrents_page(in_memory_torrent_repository.clone(), Some(&Pagination::default())).await;
 
             assert_eq!(torrents, vec![]);
         }
@@ -253,14 +243,14 @@ mod tests {
         async fn should_return_a_summarized_info_for_all_torrents() {
             let config = tracker_configuration();
 
-            let tracker = initialize_tracker_and_deps(&config);
+            let (tracker, in_memory_torrent_repository) = initialize_tracker_and_deps(&config);
 
             let hash = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned();
             let info_hash = InfoHash::from_str(&hash).unwrap();
 
             let _ = tracker.upsert_peer_and_get_stats(&info_hash, &sample_peer());
 
-            let torrents = get_torrents_page(tracker.clone(), Some(&Pagination::default())).await;
+            let torrents = get_torrents_page(in_memory_torrent_repository.clone(), Some(&Pagination::default())).await;
 
             assert_eq!(
                 torrents,
@@ -277,7 +267,7 @@ mod tests {
         async fn should_allow_limiting_the_number_of_torrents_in_the_result() {
             let config = tracker_configuration();
 
-            let tracker = initialize_tracker_and_deps(&config);
+            let (tracker, in_memory_torrent_repository) = initialize_tracker_and_deps(&config);
 
             let hash1 = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned();
             let info_hash1 = InfoHash::from_str(&hash1).unwrap();
@@ -290,7 +280,7 @@ mod tests {
             let offset = 0;
             let limit = 1;
 
-            let torrents = get_torrents_page(tracker.clone(), Some(&Pagination::new(offset, limit))).await;
+            let torrents = get_torrents_page(in_memory_torrent_repository.clone(), Some(&Pagination::new(offset, limit))).await;
 
             assert_eq!(torrents.len(), 1);
         }
@@ -299,7 +289,7 @@ mod tests {
         async fn should_allow_using_pagination_in_the_result() {
             let config = tracker_configuration();
 
-            let tracker = initialize_tracker_and_deps(&config);
+            let (tracker, in_memory_torrent_repository) = initialize_tracker_and_deps(&config);
 
             let hash1 = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned();
             let info_hash1 = InfoHash::from_str(&hash1).unwrap();
@@ -312,7 +302,7 @@ mod tests {
             let offset = 1;
             let limit = 4000;
 
-            let torrents = get_torrents_page(tracker.clone(), Some(&Pagination::new(offset, limit))).await;
+            let torrents = get_torrents_page(in_memory_torrent_repository.clone(), Some(&Pagination::new(offset, limit))).await;
 
             assert_eq!(torrents.len(), 1);
             assert_eq!(
@@ -330,7 +320,7 @@ mod tests {
         async fn should_return_torrents_ordered_by_info_hash() {
             let config = tracker_configuration();
 
-            let tracker = initialize_tracker_and_deps(&config);
+            let (tracker, in_memory_torrent_repository) = initialize_tracker_and_deps(&config);
 
             let hash1 = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned();
             let info_hash1 = InfoHash::from_str(&hash1).unwrap();
@@ -340,7 +330,7 @@ mod tests {
             let info_hash2 = InfoHash::from_str(&hash2).unwrap();
             let _ = tracker.upsert_peer_and_get_stats(&info_hash2, &sample_peer());
 
-            let torrents = get_torrents_page(tracker.clone(), Some(&Pagination::default())).await;
+            let torrents = get_torrents_page(in_memory_torrent_repository.clone(), Some(&Pagination::default())).await;
 
             assert_eq!(
                 torrents,