refactor: [#1485] simplify event mods in pakages using the events pkg

Author: josecelano

…kages/http-tracker-core/src/event/mod.rs packages/http-tracker-core/src/event.rspackages/http-tracker-core/src/event/mod.rs renamed to packages/http-tracker-core/src/event.rs packages/http-tracker-core/src/event/mod.rs renamed to packages/http-tracker-core/src/event.rs

@@ -1,7 +1,3 @@
-pub mod bus;
-pub mod receiver;
-pub mod sender;
-
 use std::net::{IpAddr, SocketAddr};
 
 use bittorrent_http_tracker_protocol::v1::services::peer_ip_resolver::RemoteClientAddr;
@@ -98,6 +94,27 @@ impl From<ConnectionContext> for LabelSet {
     }
 }
 
+pub mod sender {
+    use std::sync::Arc;
+
+    use super::Event;
+
+    pub type Sender = Option<Arc<dyn torrust_tracker_events::sender::Sender<Event = Event>>>;
+    pub type Broadcaster = torrust_tracker_events::broadcaster::Broadcaster<Event>;
+}
+
+pub mod receiver {
+    use super::Event;
+
+    pub type Receiver = Box<dyn torrust_tracker_events::receiver::Receiver<Event = Event>>;
+}
+
+pub mod bus {
+    use crate::event::Event;
+
+    pub type EventBus = torrust_tracker_events::bus::EventBus<Event>;
+}
+
 #[cfg(test)]
 pub mod test {
 

packages/http-tracker-core/src/event/bus.rs

@@ -1,7 +1,3 @@
-pub mod bus;
-pub mod receiver;
-pub mod sender;
-
 use std::net::SocketAddr;
 
 use bittorrent_primitives::info_hash::InfoHash;
@@ -70,3 +66,24 @@ impl From<ConnectionContext> for LabelSet {
         ])
     }
 }
+
+pub mod sender {
+    use std::sync::Arc;
+
+    use super::Event;
+
+    pub type Sender = Option<Arc<dyn torrust_tracker_events::sender::Sender<Event = Event>>>;
+    pub type Broadcaster = torrust_tracker_events::broadcaster::Broadcaster<Event>;
+}
+
+pub mod receiver {
+    use super::Event;
+
+    pub type Receiver = Box<dyn torrust_tracker_events::receiver::Receiver<Event = Event>>;
+}
+
+pub mod bus {
+    use crate::event::Event;
+
+    pub type EventBus = torrust_tracker_events::bus::EventBus<Event>;
+}

packages/http-tracker-core/src/event/receiver.rs

@@ -1,7 +1,3 @@
-pub mod bus;
-pub mod receiver;
-pub mod sender;
-
 use std::fmt;
 use std::net::SocketAddr;
 use std::time::Duration;
@@ -112,3 +108,24 @@ impl From<ConnectionContext> for LabelSet {
         ])
     }
 }
+
+pub mod sender {
+    use std::sync::Arc;
+
+    use super::Event;
+
+    pub type Sender = Option<Arc<dyn torrust_tracker_events::sender::Sender<Event = Event>>>;
+    pub type Broadcaster = torrust_tracker_events::broadcaster::Broadcaster<Event>;
+}
+
+pub mod receiver {
+    use super::Event;
+
+    pub type Receiver = Box<dyn torrust_tracker_events::receiver::Receiver<Event = Event>>;
+}
+
+pub mod bus {
+    use crate::event::Event;
+
+    pub type EventBus = torrust_tracker_events::bus::EventBus<Event>;
+}