Skip to content

Commit c2df95f

Browse files
josecelanojosecelano
committed
refactor: [torrust#1485] rename trait fn send_event to send
1 parent f546bc1 commit c2df95f

File tree

17 files changed

+42
-42
lines changed

17 files changed

+42
-42
lines changed

‎packages/events/src/broadcaster.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl<Event: Sync + Send + Clone> Broadcaster<Event> {
3030
impl<Event: Sync + Send + Clone> Sender for Broadcaster<Event> {
3131
type Event = Event;
3232

33-
fn send_event(&self, event: Event) -> BoxFuture<'_, Option<Result<usize, SendError<Event>>>> {
33+
fn send(&self, event: Event) -> BoxFuture<'_, Option<Result<usize, SendError<Event>>>> {
3434
async move { Some(self.sender.send(event).map_err(std::convert::Into::into)) }.boxed()
3535
}
3636
}

‎packages/events/src/sender.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ use mockall::{automock, predicate::str};
99
pub trait Sender: Sync + Send {
1010
type Event: Send + Clone;
1111

12-
fn send_event(&self, event: Self::Event) -> BoxFuture<'_, Option<Result<usize, SendError<Self::Event>>>>;
12+
fn send(&self, event: Self::Event) -> BoxFuture<'_, Option<Result<usize, SendError<Self::Event>>>>;
1313
}
1414

15-
/// Error returned by the [`send_event`] function on a [`Sender`].
15+
/// Error returned by the [`send`] function on a [`Sender`].
1616
#[derive(Debug)]
1717
pub struct SendError<Event>(pub Event);
1818

‎packages/http-tracker-core/benches/helpers/util.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,6 @@ mock! {
127127
impl torrust_tracker_events::sender::Sender for HttpStatsEventSender {
128128
type Event = Event;
129129

130-
fn send_event(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
130+
fn send(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
131131
}
132132
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl AnnounceService {
146146

147147
tracing::debug!("Sending TcpAnnounce event: {:?}", event);
148148

149-
http_stats_event_sender.send_event(event).await;
149+
http_stats_event_sender.send(event).await;
150150
}
151151
}
152152
}
@@ -314,7 +314,7 @@ mod tests {
314314
impl torrust_tracker_events::sender::Sender for HttpStatsEventSender {
315315
type Event = Event;
316316

317-
fn send_event(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
317+
fn send(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
318318
}
319319
}
320320

@@ -390,7 +390,7 @@ mod tests {
390390

391391
let mut http_stats_event_sender_mock = MockHttpStatsEventSender::new();
392392
http_stats_event_sender_mock
393-
.expect_send_event()
393+
.expect_send()
394394
.with(predicate::function(move |event| {
395395
let mut announced_peer = peer_copy;
396396
announced_peer.peer_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1)), 8080);
@@ -463,7 +463,7 @@ mod tests {
463463

464464
let mut http_stats_event_sender_mock = MockHttpStatsEventSender::new();
465465
http_stats_event_sender_mock
466-
.expect_send_event()
466+
.expect_send()
467467
.with(predicate::function(move |event| {
468468
let mut announced_peer = peer_copy;
469469
announced_peer.peer_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080);
@@ -521,7 +521,7 @@ mod tests {
521521

522522
let mut http_stats_event_sender_mock = MockHttpStatsEventSender::new();
523523
http_stats_event_sender_mock
524-
.expect_send_event()
524+
.expect_send()
525525
.with(predicate::function(move |event| {
526526
let expected_event = Event::TcpAnnounce {
527527
connection: ConnectionContext::new(

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl ScrapeService {
108108

109109
tracing::debug!("Sending TcpScrape event: {:?}", event);
110110

111-
http_stats_event_sender.send_event(event).await;
111+
http_stats_event_sender.send(event).await;
112112
}
113113
}
114114
}
@@ -241,7 +241,7 @@ mod tests {
241241
impl torrust_tracker_events::sender::Sender for HttpStatsEventSender {
242242
type Event = Event;
243243

244-
fn send_event(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
244+
fn send(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
245245
}
246246
}
247247

@@ -337,7 +337,7 @@ mod tests {
337337

338338
let mut http_stats_event_sender_mock = MockHttpStatsEventSender::new();
339339
http_stats_event_sender_mock
340-
.expect_send_event()
340+
.expect_send()
341341
.with(eq(Event::TcpScrape {
342342
connection: ConnectionContext::new(
343343
RemoteClientAddr::new(
@@ -390,7 +390,7 @@ mod tests {
390390

391391
let mut http_stats_event_sender_mock = MockHttpStatsEventSender::new();
392392
http_stats_event_sender_mock
393-
.expect_send_event()
393+
.expect_send()
394394
.with(eq(Event::TcpScrape {
395395
connection: ConnectionContext::new(
396396
RemoteClientAddr::new(
@@ -521,7 +521,7 @@ mod tests {
521521

522522
let mut http_stats_event_sender_mock = MockHttpStatsEventSender::new();
523523
http_stats_event_sender_mock
524-
.expect_send_event()
524+
.expect_send()
525525
.with(eq(Event::TcpScrape {
526526
connection: ConnectionContext::new(
527527
RemoteClientAddr::new(
@@ -574,7 +574,7 @@ mod tests {
574574

575575
let mut http_stats_event_sender_mock = MockHttpStatsEventSender::new();
576576
http_stats_event_sender_mock
577-
.expect_send_event()
577+
.expect_send()
578578
.with(eq(Event::TcpScrape {
579579
connection: ConnectionContext::new(
580580
RemoteClientAddr::new(

‎packages/udp-tracker-core/benches/helpers/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ mock! {
2222
impl torrust_tracker_events::sender::Sender for UdpCoreStatsEventSender {
2323
type Event = Event;
2424

25-
fn send_event(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
25+
fn send(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
2626
}
2727
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl AnnounceService {
121121

122122
println!("Sending UdpAnnounce event: {event:?}");
123123

124-
udp_stats_event_sender.send_event(event).await;
124+
udp_stats_event_sender.send(event).await;
125125
}
126126
}
127127
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl ConnectService {
4141

4242
if let Some(udp_stats_event_sender) = self.opt_udp_core_stats_event_sender.as_deref() {
4343
udp_stats_event_sender
44-
.send_event(Event::UdpConnect {
44+
.send(Event::UdpConnect {
4545
connection: ConnectionContext::new(client_socket_addr, server_service_binding),
4646
})
4747
.await;
@@ -145,7 +145,7 @@ mod tests {
145145

146146
let mut udp_stats_event_sender_mock = MockUdpCoreStatsEventSender::new();
147147
udp_stats_event_sender_mock
148-
.expect_send_event()
148+
.expect_send()
149149
.with(eq(Event::UdpConnect {
150150
connection: ConnectionContext::new(client_socket_addr, server_service_binding.clone()),
151151
}))
@@ -168,7 +168,7 @@ mod tests {
168168

169169
let mut udp_stats_event_sender_mock = MockUdpCoreStatsEventSender::new();
170170
udp_stats_event_sender_mock
171-
.expect_send_event()
171+
.expect_send()
172172
.with(eq(Event::UdpConnect {
173173
connection: ConnectionContext::new(client_socket_addr, server_service_binding.clone()),
174174
}))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub(crate) mod tests {
4848
impl torrust_tracker_events::sender::Sender for UdpCoreStatsEventSender {
4949
type Event = Event;
5050

51-
fn send_event(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
51+
fn send(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
5252
}
5353
}
5454
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl ScrapeService {
8888

8989
tracing::debug!(target = crate::UDP_TRACKER_LOG_TARGET, "Sending UdpScrape event: {event:?}");
9090

91-
udp_stats_event_sender.send_event(event).await;
91+
udp_stats_event_sender.send(event).await;
9292
}
9393
}
9494
}

0 commit comments

Comments
 (0)