Skip to content

Commit 8f5b57e

Browse files
josecelanojosecelano
committed
refactor: [torrust#1485] replace Arc<Option> with Option<Arc> in events pkg
1 parent c2df95f commit 8f5b57e

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

‎packages/events/src/bus.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ impl<Event: Sync + Send + Clone + 'static> EventBus<Event> {
2727
}
2828

2929
#[must_use]
30-
pub fn sender(&self) -> Arc<Option<Box<dyn sender::Sender<Event = Event>>>> {
30+
pub fn sender(&self) -> Option<Arc<Box<dyn sender::Sender<Event = Event>>>> {
3131
if self.enable_sender {
32-
Arc::new(Some(Box::new(self.broadcaster.clone())))
32+
Some(Arc::new(Box::new(self.broadcaster.clone())))
3333
} else {
34-
Arc::new(None)
34+
None
3535
}
3636
}
3737

‎packages/http-tracker-core/src/event/sender.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ use std::sync::Arc;
22

33
use super::Event;
44

5-
pub type Sender = Arc<Option<Box<dyn torrust_tracker_events::sender::Sender<Event = Event>>>>;
5+
pub type Sender = Option<Arc<Box<dyn torrust_tracker_events::sender::Sender<Event = Event>>>>;
66
pub type Broadcaster = torrust_tracker_events::broadcaster::Broadcaster<Event>;

‎packages/http-tracker-core/src/services/announce.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ mod tests {
411411
}))
412412
.times(1)
413413
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
414-
let http_stats_event_sender: crate::event::sender::Sender = Arc::new(Some(Box::new(http_stats_event_sender_mock)));
414+
let http_stats_event_sender: crate::event::sender::Sender = Some(Arc::new(Box::new(http_stats_event_sender_mock)));
415415

416416
let (core_tracker_services, mut core_http_tracker_services) = initialize_core_tracker_services();
417417

@@ -488,7 +488,7 @@ mod tests {
488488
.times(1)
489489
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
490490

491-
let http_stats_event_sender: crate::event::sender::Sender = Arc::new(Some(Box::new(http_stats_event_sender_mock)));
491+
let http_stats_event_sender: crate::event::sender::Sender = Some(Arc::new(Box::new(http_stats_event_sender_mock)));
492492

493493
let (core_tracker_services, mut core_http_tracker_services) =
494494
initialize_core_tracker_services_with_config(&tracker_with_an_ipv6_external_ip());
@@ -535,7 +535,7 @@ mod tests {
535535
}))
536536
.times(1)
537537
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
538-
let http_stats_event_sender: crate::event::sender::Sender = Arc::new(Some(Box::new(http_stats_event_sender_mock)));
538+
let http_stats_event_sender: crate::event::sender::Sender = Some(Arc::new(Box::new(http_stats_event_sender_mock)));
539539

540540
let (core_tracker_services, mut core_http_tracker_services) = initialize_core_tracker_services();
541541
core_http_tracker_services.http_stats_event_sender = http_stats_event_sender;

‎packages/http-tracker-core/src/services/scrape.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ mod tests {
350350
}))
351351
.times(1)
352352
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
353-
let http_stats_event_sender: crate::event::sender::Sender = Arc::new(Some(Box::new(http_stats_event_sender_mock)));
353+
let http_stats_event_sender: crate::event::sender::Sender = Some(Arc::new(Box::new(http_stats_event_sender_mock)));
354354

355355
let container = initialize_services_with_configuration(&config);
356356

@@ -404,7 +404,7 @@ mod tests {
404404
}))
405405
.times(1)
406406
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
407-
let http_stats_event_sender: crate::event::sender::Sender = Arc::new(Some(Box::new(http_stats_event_sender_mock)));
407+
let http_stats_event_sender: crate::event::sender::Sender = Some(Arc::new(Box::new(http_stats_event_sender_mock)));
408408

409409
let container = initialize_services_with_configuration(&config);
410410

@@ -534,7 +534,7 @@ mod tests {
534534
}))
535535
.times(1)
536536
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
537-
let http_stats_event_sender: crate::event::sender::Sender = Arc::new(Some(Box::new(http_stats_event_sender_mock)));
537+
let http_stats_event_sender: crate::event::sender::Sender = Some(Arc::new(Box::new(http_stats_event_sender_mock)));
538538

539539
let peer_ip = IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1));
540540

@@ -588,7 +588,7 @@ mod tests {
588588
}))
589589
.times(1)
590590
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
591-
let http_stats_event_sender: crate::event::sender::Sender = Arc::new(Some(Box::new(http_stats_event_sender_mock)));
591+
let http_stats_event_sender: crate::event::sender::Sender = Some(Arc::new(Box::new(http_stats_event_sender_mock)));
592592

593593
let peer_ip = IpAddr::V6(Ipv6Addr::new(0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969));
594594

‎packages/udp-tracker-core/src/event/sender.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ use std::sync::Arc;
22

33
use super::Event;
44

5-
pub type Sender = Arc<Option<Box<dyn torrust_tracker_events::sender::Sender<Event = Event>>>>;
5+
pub type Sender = Option<Arc<Box<dyn torrust_tracker_events::sender::Sender<Event = Event>>>>;
66
pub type Broadcaster = torrust_tracker_events::broadcaster::Broadcaster<Event>;

‎packages/udp-tracker-core/src/services/connect.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ mod tests {
151151
}))
152152
.times(1)
153153
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
154-
let opt_udp_stats_event_sender: crate::event::sender::Sender = Arc::new(Some(Box::new(udp_stats_event_sender_mock)));
154+
let opt_udp_stats_event_sender: crate::event::sender::Sender = Some(Arc::new(Box::new(udp_stats_event_sender_mock)));
155155

156156
let connect_service = Arc::new(ConnectService::new(opt_udp_stats_event_sender));
157157

@@ -174,7 +174,7 @@ mod tests {
174174
}))
175175
.times(1)
176176
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
177-
let opt_udp_stats_event_sender: crate::event::sender::Sender = Arc::new(Some(Box::new(udp_stats_event_sender_mock)));
177+
let opt_udp_stats_event_sender: crate::event::sender::Sender = Some(Arc::new(Box::new(udp_stats_event_sender_mock)));
178178

179179
let connect_service = Arc::new(ConnectService::new(opt_udp_stats_event_sender));
180180

‎packages/udp-tracker-server/src/event/sender.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ use std::sync::Arc;
22

33
use super::Event;
44

5-
pub type Sender = Arc<Option<Box<dyn torrust_tracker_events::sender::Sender<Event = Event>>>>;
5+
pub type Sender = Option<Arc<Box<dyn torrust_tracker_events::sender::Sender<Event = Event>>>>;
66
pub type Broadcaster = torrust_tracker_events::broadcaster::Broadcaster<Event>;

‎packages/udp-tracker-server/src/handlers/announce.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ mod tests {
435435
.times(1)
436436
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
437437
let udp_server_stats_event_sender: crate::event::sender::Sender =
438-
Arc::new(Some(Box::new(udp_server_stats_event_sender_mock)));
438+
Some(Arc::new(Box::new(udp_server_stats_event_sender_mock)));
439439

440440
let (core_tracker_services, core_udp_tracker_services, _server_udp_tracker_services) =
441441
initialize_core_tracker_services_for_default_tracker_configuration();
@@ -789,7 +789,7 @@ mod tests {
789789
.times(1)
790790
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
791791
let udp_server_stats_event_sender: crate::event::sender::Sender =
792-
Arc::new(Some(Box::new(udp_server_stats_event_sender_mock)));
792+
Some(Arc::new(Box::new(udp_server_stats_event_sender_mock)));
793793

794794
let (core_tracker_services, core_udp_tracker_services, _server_udp_tracker_services) =
795795
initialize_core_tracker_services_for_default_tracker_configuration();
@@ -889,7 +889,7 @@ mod tests {
889889
.times(1)
890890
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
891891
let udp_core_stats_event_sender: bittorrent_udp_tracker_core::event::sender::Sender =
892-
Arc::new(Some(Box::new(udp_core_stats_event_sender_mock)));
892+
Some(Arc::new(Box::new(udp_core_stats_event_sender_mock)));
893893

894894
let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
895895
udp_server_stats_event_sender_mock
@@ -901,7 +901,7 @@ mod tests {
901901
.times(1)
902902
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
903903
let udp_server_stats_event_sender: crate::event::sender::Sender =
904-
Arc::new(Some(Box::new(udp_server_stats_event_sender_mock)));
904+
Some(Arc::new(Box::new(udp_server_stats_event_sender_mock)));
905905

906906
let announce_handler = Arc::new(AnnounceHandler::new(
907907
&config.core,

‎packages/udp-tracker-server/src/handlers/connect.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ mod tests {
211211
.times(1)
212212
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
213213
let udp_core_stats_event_sender: bittorrent_udp_tracker_core::event::sender::Sender =
214-
Arc::new(Some(Box::new(udp_core_stats_event_sender_mock)));
214+
Some(Arc::new(Box::new(udp_core_stats_event_sender_mock)));
215215

216216
let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
217217
udp_server_stats_event_sender_mock
@@ -223,7 +223,7 @@ mod tests {
223223
.times(1)
224224
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
225225
let udp_server_stats_event_sender: crate::event::sender::Sender =
226-
Arc::new(Some(Box::new(udp_server_stats_event_sender_mock)));
226+
Some(Arc::new(Box::new(udp_server_stats_event_sender_mock)));
227227

228228
let connect_service = Arc::new(ConnectService::new(udp_core_stats_event_sender));
229229

@@ -253,7 +253,7 @@ mod tests {
253253
.times(1)
254254
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
255255
let udp_core_stats_event_sender: bittorrent_udp_tracker_core::event::sender::Sender =
256-
Arc::new(Some(Box::new(udp_core_stats_event_sender_mock)));
256+
Some(Arc::new(Box::new(udp_core_stats_event_sender_mock)));
257257

258258
let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
259259
udp_server_stats_event_sender_mock
@@ -265,7 +265,7 @@ mod tests {
265265
.times(1)
266266
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
267267
let udp_server_stats_event_sender: crate::event::sender::Sender =
268-
Arc::new(Some(Box::new(udp_server_stats_event_sender_mock)));
268+
Some(Arc::new(Box::new(udp_server_stats_event_sender_mock)));
269269

270270
let connect_service = Arc::new(ConnectService::new(udp_core_stats_event_sender));
271271

‎packages/udp-tracker-server/src/handlers/scrape.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ mod tests {
386386
.times(1)
387387
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
388388
let udp_server_stats_event_sender: crate::event::sender::Sender =
389-
Arc::new(Some(Box::new(udp_server_stats_event_sender_mock)));
389+
Some(Arc::new(Box::new(udp_server_stats_event_sender_mock)));
390390

391391
let (_core_tracker_services, core_udp_tracker_services, _server_udp_tracker_services) =
392392
initialize_core_tracker_services_for_default_tracker_configuration();
@@ -436,7 +436,7 @@ mod tests {
436436
.times(1)
437437
.returning(|_| Box::pin(future::ready(Some(Ok(1)))));
438438
let udp_server_stats_event_sender: crate::event::sender::Sender =
439-
Arc::new(Some(Box::new(udp_server_stats_event_sender_mock)));
439+
Some(Arc::new(Box::new(udp_server_stats_event_sender_mock)));
440440

441441
let (_core_tracker_services, core_udp_tracker_services, _server_udp_tracker_services) =
442442
initialize_core_tracker_services_for_default_tracker_configuration();

0 commit comments

Comments
 (0)