refactor: [torrust#1478] rename struct fields for Keeper type

Author: josecelano

packages/axum-http-tracker-server/src/environment.rs

@@ -70,7 +70,7 @@ impl Environment<Stopped> {
     pub async fn start(self) -> Environment<Running> {
         // Start the event listener
         let event_listener_job = run_event_listener(
-            self.container.http_tracker_core_container.stats_keeper.receiver(),
+            self.container.http_tracker_core_container.event_bus.receiver(),
             &self.container.http_tracker_core_container.stats_repository,
         );
 

packages/axum-http-tracker-server/src/server.rs

@@ -308,7 +308,7 @@ mod tests {
         HttpTrackerCoreContainer {
             tracker_core_container,
             http_tracker_config,
-            stats_keeper: http_stats_event_bus,
+            event_bus: http_stats_event_bus,
             stats_event_sender: http_stats_event_sender,
             stats_repository: http_stats_repository,
             announce_service,

packages/http-tracker-core/src/container.rs

@@ -16,7 +16,7 @@ pub struct HttpTrackerCoreContainer {
     pub tracker_core_container: Arc<TrackerCoreContainer>,
 
     // `HttpTrackerCoreServices`
-    pub stats_keeper: Arc<statistics::event_bus::EventBus>,
+    pub event_bus: Arc<statistics::event_bus::EventBus>,
     pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
     pub stats_repository: Arc<statistics::repository::Repository>,
     pub announce_service: Arc<AnnounceService>,
@@ -48,7 +48,7 @@ impl HttpTrackerCoreContainer {
         Arc::new(Self {
             tracker_core_container: tracker_core_container.clone(),
             http_tracker_config: http_tracker_config.clone(),
-            stats_keeper: http_tracker_core_services.stats_keeper.clone(),
+            event_bus: http_tracker_core_services.event_bus.clone(),
             stats_event_sender: http_tracker_core_services.stats_event_sender.clone(),
             stats_repository: http_tracker_core_services.stats_repository.clone(),
             announce_service: http_tracker_core_services.announce_service.clone(),
@@ -58,7 +58,7 @@ impl HttpTrackerCoreContainer {
 }
 
 pub struct HttpTrackerCoreServices {
-    pub stats_keeper: Arc<statistics::event_bus::EventBus>,
+    pub event_bus: Arc<statistics::event_bus::EventBus>,
     pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
     pub stats_repository: Arc<statistics::repository::Repository>,
     pub announce_service: Arc<services::announce::AnnounceService>,
@@ -94,7 +94,7 @@ impl HttpTrackerCoreServices {
         ));
 
         Arc::new(Self {
-            stats_keeper: http_stats_event_bus,
+            event_bus: http_stats_event_bus,
             stats_event_sender: http_stats_event_sender,
             stats_repository: http_stats_repository,
             announce_service: http_announce_service,

packages/udp-tracker-core/src/container.rs

@@ -19,7 +19,7 @@ pub struct UdpTrackerCoreContainer {
     pub tracker_core_container: Arc<TrackerCoreContainer>,
 
     // `UdpTrackerCoreServices`
-    pub stats_keeper: Arc<statistics::event_bus::EventBus>,
+    pub event_bus: Arc<statistics::event_bus::EventBus>,
     pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
     pub stats_repository: Arc<statistics::repository::Repository>,
     pub ban_service: Arc<RwLock<BanService>>,
@@ -56,7 +56,7 @@ impl UdpTrackerCoreContainer {
             tracker_core_container: tracker_core_container.clone(),
 
             // `UdpTrackerCoreServices`
-            stats_keeper: udp_tracker_core_services.stats_keeper.clone(),
+            event_bus: udp_tracker_core_services.event_bus.clone(),
             stats_event_sender: udp_tracker_core_services.stats_event_sender.clone(),
             stats_repository: udp_tracker_core_services.stats_repository.clone(),
             ban_service: udp_tracker_core_services.ban_service.clone(),
@@ -68,7 +68,7 @@ impl UdpTrackerCoreContainer {
 }
 
 pub struct UdpTrackerCoreServices {
-    pub stats_keeper: Arc<statistics::event_bus::EventBus>,
+    pub event_bus: Arc<statistics::event_bus::EventBus>,
     pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
     pub stats_repository: Arc<statistics::repository::Repository>,
     pub ban_service: Arc<RwLock<services::banning::BanService>>,
@@ -101,7 +101,7 @@ impl UdpTrackerCoreServices {
         ));
 
         Arc::new(Self {
-            stats_keeper: event_bus,
+            event_bus,
             stats_event_sender: udp_core_stats_event_sender,
             stats_repository: udp_core_stats_repository,
             ban_service,

packages/udp-tracker-server/src/container.rs

@@ -9,7 +9,7 @@ use crate::statistics::event_bus::EventBus;
 use crate::statistics::repository::Repository;
 
 pub struct UdpTrackerServerContainer {
-    pub stats_keeper: Arc<statistics::event_bus::EventBus>,
+    pub event_bus: Arc<statistics::event_bus::EventBus>,
     pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
     pub stats_repository: Arc<statistics::repository::Repository>,
 }
@@ -20,15 +20,15 @@ impl UdpTrackerServerContainer {
         let udp_tracker_server_services = UdpTrackerServerServices::initialize(core_config);
 
         Arc::new(Self {
-            stats_keeper: udp_tracker_server_services.stats_keeper.clone(),
+            event_bus: udp_tracker_server_services.event_bus.clone(),
             stats_event_sender: udp_tracker_server_services.stats_event_sender.clone(),
             stats_repository: udp_tracker_server_services.stats_repository.clone(),
         })
     }
 }
 
 pub struct UdpTrackerServerServices {
-    pub stats_keeper: Arc<statistics::event_bus::EventBus>,
+    pub event_bus: Arc<statistics::event_bus::EventBus>,
     pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
     pub stats_repository: Arc<statistics::repository::Repository>,
 }
@@ -46,7 +46,7 @@ impl UdpTrackerServerServices {
         let udp_server_stats_event_sender = udp_server_stats_event_bus.sender();
 
         Arc::new(Self {
-            stats_keeper: udp_server_stats_event_bus.clone(),
+            event_bus: udp_server_stats_event_bus.clone(),
             stats_event_sender: udp_server_stats_event_sender.clone(),
             stats_repository: udp_server_stats_repository.clone(),
         })

packages/udp-tracker-server/src/environment.rs

@@ -73,13 +73,13 @@ impl Environment<Stopped> {
         let cookie_lifetime = self.container.udp_tracker_core_container.udp_tracker_config.cookie_lifetime;
         // Start the UDP tracker core event listener
         let udp_core_event_listener_job = Some(bittorrent_udp_tracker_core::statistics::event::listener::run_event_listener(
-            self.container.udp_tracker_core_container.stats_keeper.receiver(),
+            self.container.udp_tracker_core_container.event_bus.receiver(),
             &self.container.udp_tracker_core_container.stats_repository,
         ));
 
         // Start the UDP tracker server event listener
         let udp_server_event_listener_job = Some(crate::statistics::event::listener::run_event_listener(
-            self.container.udp_tracker_server_container.stats_keeper.receiver(),
+            self.container.udp_tracker_server_container.event_bus.receiver(),
             &self.container.udp_tracker_server_container.stats_repository,
         ));
 

src/app.rs

@@ -112,7 +112,7 @@ async fn load_whitelisted_torrents(config: &Configuration, app_container: &Arc<A
 fn start_http_core_event_listener(config: &Configuration, app_container: &Arc<AppContainer>) {
     if config.core.tracker_usage_statistics {
         let _job = bittorrent_http_tracker_core::statistics::event::listener::run_event_listener(
-            app_container.http_tracker_core_services.stats_keeper.receiver(),
+            app_container.http_tracker_core_services.event_bus.receiver(),
             &app_container.http_tracker_core_services.stats_repository,
         );
 
@@ -132,7 +132,7 @@ fn start_http_core_event_listener(config: &Configuration, app_container: &Arc<Ap
 fn start_udp_core_event_listener(config: &Configuration, app_container: &Arc<AppContainer>) {
     if config.core.tracker_usage_statistics {
         let _job = bittorrent_udp_tracker_core::statistics::event::listener::run_event_listener(
-            app_container.udp_tracker_core_services.stats_keeper.receiver(),
+            app_container.udp_tracker_core_services.event_bus.receiver(),
             &app_container.udp_tracker_core_services.stats_repository,
         );
 
@@ -152,7 +152,7 @@ fn start_udp_core_event_listener(config: &Configuration, app_container: &Arc<App
 fn start_udp_server_event_listener(config: &Configuration, app_container: &Arc<AppContainer>) {
     if config.core.tracker_usage_statistics {
         let _job = torrust_udp_tracker_server::statistics::event::listener::run_event_listener(
-            app_container.udp_tracker_server_container.stats_keeper.receiver(),
+            app_container.udp_tracker_server_container.event_bus.receiver(),
             &app_container.udp_tracker_server_container.stats_repository,
         );