refactor: [torrust#1491] remove redundant type aliases

Author: josecelano

packages/torrent-repository/src/entry/mod.rs

@@ -1,2 +1,6 @@
 pub mod peer_list;
 pub mod torrent;
+
+use std::sync::{Arc, Mutex};
+
+pub type TorrentEntry = Arc<Mutex<torrent::Torrent>>;

packages/torrent-repository/src/lib.rs

@@ -1,23 +1,12 @@
-use std::sync::{Arc, Mutex};
-
-use torrust_tracker_clock::clock;
-
 pub mod entry;
 pub mod repository;
 
-// Repo entry
-pub type TorrentEntry = EntryMutexStd;
-
-// Repository
-pub type Torrents = TorrentsSkipMapMutexStd;
-
-// The internal type of the entry
-pub(crate) type EntryMutexStd = Arc<Mutex<entry::torrent::Torrent>>;
+use torrust_tracker_clock::clock;
 
-// The internal type of the repository
-pub(crate) type TorrentsSkipMapMutexStd = repository::TorrentsSkipMapMutexStd;
+pub type TorrentEntry = entry::TorrentEntry;
+pub type Torrent = entry::torrent::Torrent;
+pub type Torrents = repository::TorrentsSkipMapMutexStd;
 
-/// This code needs to be copied into each crate.
 /// Working version, for production.
 #[cfg(not(test))]
 #[allow(dead_code)]

packages/torrent-repository/src/repository.rs

@@ -7,11 +7,11 @@ use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent
 
 use crate::entry::peer_list::PeerList;
 use crate::entry::torrent::Torrent;
-use crate::EntryMutexStd;
+use crate::TorrentEntry;
 
 #[derive(Default, Debug)]
 pub struct TorrentsSkipMapMutexStd {
-    pub torrents: SkipMap<InfoHash, EntryMutexStd>,
+    pub torrents: SkipMap<InfoHash, TorrentEntry>,
 }
 
 impl TorrentsSkipMapMutexStd {
@@ -53,15 +53,15 @@ impl TorrentsSkipMapMutexStd {
             tracing::debug!("Inserting new torrent: {:?}", info_hash);
 
             let new_entry = if let Some(number_of_downloads) = opt_persistent_torrent {
-                EntryMutexStd::new(
+                TorrentEntry::new(
                     Torrent {
                         swarm: PeerList::default(),
                         downloaded: number_of_downloads,
                     }
                     .into(),
                 )
             } else {
-                EntryMutexStd::default()
+                TorrentEntry::default()
             };
 
             let inserted_entry = self.torrents.get_or_insert(*info_hash, new_entry);
@@ -85,7 +85,7 @@ impl TorrentsSkipMapMutexStd {
         })
     }
 
-    pub fn get(&self, key: &InfoHash) -> Option<EntryMutexStd> {
+    pub fn get(&self, key: &InfoHash) -> Option<TorrentEntry> {
         let maybe_entry = self.torrents.get(key);
         maybe_entry.map(|entry| entry.value().clone())
     }
@@ -107,7 +107,7 @@ impl TorrentsSkipMapMutexStd {
         metrics
     }
 
-    pub fn get_paginated(&self, pagination: Option<&Pagination>) -> Vec<(InfoHash, EntryMutexStd)> {
+    pub fn get_paginated(&self, pagination: Option<&Pagination>) -> Vec<(InfoHash, TorrentEntry)> {
         match pagination {
             Some(pagination) => self
                 .torrents
@@ -130,7 +130,7 @@ impl TorrentsSkipMapMutexStd {
                 continue;
             }
 
-            let entry = EntryMutexStd::new(
+            let entry = TorrentEntry::new(
                 Torrent {
                     swarm: PeerList::default(),
                     downloaded: *completed,
@@ -144,7 +144,7 @@ impl TorrentsSkipMapMutexStd {
         }
     }
 
-    pub fn remove(&self, key: &InfoHash) -> Option<EntryMutexStd> {
+    pub fn remove(&self, key: &InfoHash) -> Option<TorrentEntry> {
         self.torrents.remove(key).map(|entry| entry.value().clone())
     }