refactor: removed unused code and extract fn

- The StatsTracker does not need anymore the channel sender.
- A setup function for statistics was extracted.

Author: josecelano

src/lib.rs

@@ -14,6 +14,7 @@ pub mod jobs;
 pub mod logging;
 pub mod protocol;
 pub mod setup;
+pub mod stats;
 pub mod tracker;
 pub mod udp;
 

src/main.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use log::info;
-use torrust_tracker::tracker::statistics::StatsTracker;
+use torrust_tracker::stats::setup_statistics;
 use torrust_tracker::tracker::tracker::TorrentTracker;
 use torrust_tracker::{ephemeral_instance_keys, logging, setup, static_time, Configuration};
 
@@ -23,14 +23,8 @@ async fn main() {
         }
     };
 
-    // Initialize stats tracker
-    let mut stats_tracker = StatsTracker::new_inactive_instance();
-
-    let mut stats_event_sender = None;
-
-    if config.tracker_usage_statistics {
-        stats_event_sender = Some(stats_tracker.run_worker());
-    }
+    // Initialize statistics:wq
+    let (stats_tracker, stats_event_sender) = setup_statistics(config.tracker_usage_statistics);
 
     // Initialize Torrust tracker
     let tracker = match TorrentTracker::new(config.clone(), Box::new(stats_tracker), stats_event_sender) {

src/stats.rs

@@ -0,0 +1,36 @@
+use crate::statistics::{StatsTracker, TrackerStatisticsEventSender};
+
+pub fn setup_statistics(tracker_usage_statistics: bool) -> (StatsTracker, Option<Box<dyn TrackerStatisticsEventSender>>) {
+    let mut stats_tracker = StatsTracker::new_inactive_instance();
+
+    let mut stats_event_sender = None;
+
+    if tracker_usage_statistics {
+        stats_event_sender = Some(stats_tracker.run_worker());
+    }
+
+    (stats_tracker, stats_event_sender)
+}
+
+#[cfg(test)]
+mod test {
+    use crate::stats::setup_statistics;
+
+    #[tokio::test]
+    async fn should_not_send_any_event_when_statistics_are_disabled() {
+        let tracker_usage_statistics = false;
+
+        let (_stats_tracker, stats_event_sender) = setup_statistics(tracker_usage_statistics);
+
+        assert!(stats_event_sender.is_none());
+    }
+
+    #[tokio::test]
+    async fn should_send_events_when_statistics_are_enabled() {
+        let tracker_usage_statistics = true;
+
+        let (_stats_tracker, stats_event_sender) = setup_statistics(tracker_usage_statistics);
+
+        assert!(stats_event_sender.is_some());
+    }
+}

src/tracker/statistics.rs

@@ -57,14 +57,12 @@ impl TrackerStatistics {
 }
 
 pub struct StatsTracker {
-    channel_sender: Option<Sender<TrackerStatisticsEvent>>,
     pub stats: Arc<RwLock<TrackerStatistics>>,
 }
 
 impl StatsTracker {
     pub fn new_active_instance() -> (Self, Box<dyn TrackerStatisticsEventSender>) {
         let mut stats_tracker = Self {
-            channel_sender: None,
             stats: Arc::new(RwLock::new(TrackerStatistics::new())),
         };
 
@@ -75,7 +73,6 @@ impl StatsTracker {
 
     pub fn new_inactive_instance() -> Self {
         Self {
-            channel_sender: None,
             stats: Arc::new(RwLock::new(TrackerStatistics::new())),
         }
     }
@@ -92,17 +89,13 @@ impl StatsTracker {
 
     pub fn new() -> Self {
         Self {
-            channel_sender: None,
             stats: Arc::new(RwLock::new(TrackerStatistics::new())),
         }
     }
 
     pub fn run_worker(&mut self) -> Box<dyn TrackerStatisticsEventSender> {
         let (tx, mut rx) = mpsc::channel::<TrackerStatisticsEvent>(CHANNEL_BUFFER_SIZE);
 
-        // set send channel on stats_tracker
-        self.channel_sender = Some(tx.clone());
-
         let stats = self.stats.clone();
 
         tokio::spawn(async move {
@@ -159,17 +152,6 @@ pub trait TrackerStatisticsEventSender: Sync + Send {
     async fn send_event(&self, event: TrackerStatisticsEvent) -> Option<Result<(), SendError<TrackerStatisticsEvent>>>;
 }
 
-#[async_trait]
-impl TrackerStatisticsEventSender for StatsTracker {
-    async fn send_event(&self, event: TrackerStatisticsEvent) -> Option<Result<(), SendError<TrackerStatisticsEvent>>> {
-        if let Some(tx) = &self.channel_sender {
-            Some(tx.send(event).await)
-        } else {
-            None
-        }
-    }
-}
-
 pub struct StatsEventSender {
     sender: Sender<TrackerStatisticsEvent>,
 }
@@ -193,36 +175,6 @@ impl TrackerStatisticsRepository for StatsTracker {
     }
 }
 
-pub trait TrackerStatsService: TrackerStatisticsEventSender + TrackerStatisticsRepository {}
+pub trait TrackerStatsService: TrackerStatisticsRepository {}
 
 impl TrackerStatsService for StatsTracker {}
-
-#[cfg(test)]
-mod test {
-
-    mod event_sender {
-        use crate::statistics::{StatsTracker, TrackerStatisticsEvent, TrackerStatisticsEventSender};
-
-        #[tokio::test]
-        async fn should_not_send_any_event_when_statistics_are_disabled() {
-            let tracker_usage_statistics = false;
-
-            let inactive_stats_tracker = StatsTracker::new_instance(tracker_usage_statistics);
-
-            let result = inactive_stats_tracker.send_event(TrackerStatisticsEvent::Tcp4Announce).await;
-
-            assert!(result.is_none());
-        }
-
-        #[tokio::test]
-        async fn should_send_events_when_statistics_are_enabled() {
-            let tracker_usage_statistics = true;
-
-            let active_stats_tracker = StatsTracker::new_instance(tracker_usage_statistics);
-
-            let result = active_stats_tracker.send_event(TrackerStatisticsEvent::Tcp4Announce).await;
-
-            assert!(result.is_some());
-        }
-    }
-}