@@ -345,29 +345,13 @@ mod tests {
345
345
346
346
struct TrackerStatsServiceMock {
347
347
stats : Arc < RwLock < TrackerStatistics > > ,
348
- expected_event : Option < TrackerStatisticsEvent > ,
349
348
}
350
349
351
350
impl TrackerStatsServiceMock {
352
351
fn new ( ) -> Self {
353
352
Self {
354
353
stats : Arc :: new ( RwLock :: new ( TrackerStatistics :: new ( ) ) ) ,
355
- expected_event : None ,
356
- }
357
- }
358
-
359
- fn should_throw_event ( & mut self , expected_event : TrackerStatisticsEvent ) {
360
- self . expected_event = Some ( expected_event) ;
361
- }
362
- }
363
-
364
- #[ async_trait]
365
- impl TrackerStatisticsEventSender for TrackerStatsServiceMock {
366
- async fn send_event ( & self , _event : TrackerStatisticsEvent ) -> Option < Result < ( ) , SendError < TrackerStatisticsEvent > > > {
367
- if self . expected_event . is_some ( ) {
368
- assert_eq ! ( _event, * self . expected_event. as_ref( ) . unwrap( ) ) ;
369
354
}
370
- None
371
355
}
372
356
}
373
357
@@ -387,9 +371,9 @@ mod tests {
387
371
388
372
#[ async_trait]
389
373
impl TrackerStatisticsEventSender for StatsEventSenderMock {
390
- async fn send_event ( & self , _event : TrackerStatisticsEvent ) -> Option < Result < ( ) , SendError < TrackerStatisticsEvent > > > {
374
+ async fn send_event ( & self , event : TrackerStatisticsEvent ) -> Option < Result < ( ) , SendError < TrackerStatisticsEvent > > > {
391
375
if self . expected_event . is_some ( ) {
392
- assert_eq ! ( _event , * self . expected_event. as_ref( ) . unwrap( ) ) ;
376
+ assert_eq ! ( event , * self . expected_event. as_ref( ) . unwrap( ) ) ;
393
377
}
394
378
None
395
379
}
@@ -493,11 +477,11 @@ mod tests {
493
477
494
478
#[ tokio:: test]
495
479
async fn it_should_send_the_upd4_connect_event_when_a_client_tries_to_connect_using_a_ip4_socket_address ( ) {
496
- let mut tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
497
- let stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
480
+ let tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
481
+ let mut stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
498
482
499
483
let client_socket_address = sample_ipv4_socket_address ( ) ;
500
- tracker_stats_service . should_throw_event ( TrackerStatisticsEvent :: Udp4Connect ) ;
484
+ stats_event_sender . should_throw_event ( TrackerStatisticsEvent :: Udp4Connect ) ;
501
485
502
486
let torrent_tracker =
503
487
Arc :: new ( TorrentTracker :: new ( default_tracker_config ( ) , tracker_stats_service, Some ( stats_event_sender) ) . unwrap ( ) ) ;
@@ -508,10 +492,10 @@ mod tests {
508
492
509
493
#[ tokio:: test]
510
494
async fn it_should_send_the_upd6_connect_event_when_a_client_tries_to_connect_using_a_ip6_socket_address ( ) {
511
- let mut tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
512
- let stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
495
+ let tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
496
+ let mut stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
513
497
514
- tracker_stats_service . should_throw_event ( TrackerStatisticsEvent :: Udp6Connect ) ;
498
+ stats_event_sender . should_throw_event ( TrackerStatisticsEvent :: Udp6Connect ) ;
515
499
516
500
let torrent_tracker =
517
501
Arc :: new ( TorrentTracker :: new ( default_tracker_config ( ) , tracker_stats_service, Some ( stats_event_sender) ) . unwrap ( ) ) ;
@@ -748,10 +732,10 @@ mod tests {
748
732
749
733
#[ tokio:: test]
750
734
async fn should_send_the_upd4_announce_event ( ) {
751
- let mut tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
752
- let stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
735
+ let tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
736
+ let mut stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
753
737
754
- tracker_stats_service . should_throw_event ( TrackerStatisticsEvent :: Udp4Announce ) ;
738
+ stats_event_sender . should_throw_event ( TrackerStatisticsEvent :: Udp4Announce ) ;
755
739
756
740
let tracker = Arc :: new (
757
741
TorrentTracker :: new ( default_tracker_config ( ) , tracker_stats_service, Some ( stats_event_sender) ) . unwrap ( ) ,
@@ -975,10 +959,10 @@ mod tests {
975
959
976
960
#[ tokio:: test]
977
961
async fn should_send_the_upd6_announce_event ( ) {
978
- let mut tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
979
- let stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
962
+ let tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
963
+ let mut stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
980
964
981
- tracker_stats_service . should_throw_event ( TrackerStatisticsEvent :: Udp6Announce ) ;
965
+ stats_event_sender . should_throw_event ( TrackerStatisticsEvent :: Udp6Announce ) ;
982
966
983
967
let tracker = Arc :: new (
984
968
TorrentTracker :: new ( default_tracker_config ( ) , tracker_stats_service, Some ( stats_event_sender) ) . unwrap ( ) ,
@@ -1287,10 +1271,10 @@ mod tests {
1287
1271
1288
1272
#[ tokio:: test]
1289
1273
async fn should_send_the_upd4_scrape_event ( ) {
1290
- let mut tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
1291
- let stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
1274
+ let tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
1275
+ let mut stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
1292
1276
1293
- tracker_stats_service . should_throw_event ( TrackerStatisticsEvent :: Udp4Scrape ) ;
1277
+ stats_event_sender . should_throw_event ( TrackerStatisticsEvent :: Udp4Scrape ) ;
1294
1278
1295
1279
let remote_addr = sample_ipv4_remote_addr ( ) ;
1296
1280
let tracker = Arc :: new (
@@ -1316,10 +1300,10 @@ mod tests {
1316
1300
1317
1301
#[ tokio:: test]
1318
1302
async fn should_send_the_upd6_scrape_event ( ) {
1319
- let mut tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
1320
- let stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
1303
+ let tracker_stats_service = Box :: new ( TrackerStatsServiceMock :: new ( ) ) ;
1304
+ let mut stats_event_sender = Box :: new ( StatsEventSenderMock :: new ( ) ) ;
1321
1305
1322
- tracker_stats_service . should_throw_event ( TrackerStatisticsEvent :: Udp6Scrape ) ;
1306
+ stats_event_sender . should_throw_event ( TrackerStatisticsEvent :: Udp6Scrape ) ;
1323
1307
1324
1308
let remote_addr = sample_ipv6_remote_addr ( ) ;
1325
1309
let tracker = Arc :: new (
0 commit comments