Skip to content

Commit 625d20a

Browse files
josecelanojosecelano
committed
refactor: [#1382] rename torrust_udp_tracker_server::statistics::event::Event::UdpRequest
1 parent 203a1b4 commit 625d20a

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub async fn handle_announce(
4242

4343
if let Some(udp_server_stats_event_sender) = opt_udp_server_stats_event_sender.as_deref() {
4444
udp_server_stats_event_sender
45-
.send_event(server_statistics::event::Event::UdpRequest {
45+
.send_event(server_statistics::event::Event::UdpRequestAccepted {
4646
context: ConnectionContext::new(client_socket_addr, server_socket_addr),
4747
kind: UdpRequestKind::Announce,
4848
})
@@ -425,7 +425,7 @@ mod tests {
425425
let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
426426
udp_server_stats_event_sender_mock
427427
.expect_send_event()
428-
.with(eq(server_statistics::event::Event::UdpRequest {
428+
.with(eq(server_statistics::event::Event::UdpRequestAccepted {
429429
context: server_statistics::event::ConnectionContext::new(client_socket_addr, server_socket_addr),
430430
kind: UdpRequestKind::Announce,
431431
}))
@@ -768,7 +768,7 @@ mod tests {
768768
let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
769769
udp_server_stats_event_sender_mock
770770
.expect_send_event()
771-
.with(eq(server_statistics::event::Event::UdpRequest {
771+
.with(eq(server_statistics::event::Event::UdpRequestAccepted {
772772
context: server_statistics::event::ConnectionContext::new(client_socket_addr, server_socket_addr),
773773
kind: UdpRequestKind::Announce,
774774
}))
@@ -861,7 +861,7 @@ mod tests {
861861
let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
862862
udp_server_stats_event_sender_mock
863863
.expect_send_event()
864-
.with(eq(server_statistics::event::Event::UdpRequest {
864+
.with(eq(server_statistics::event::Event::UdpRequestAccepted {
865865
context: server_statistics::event::ConnectionContext::new(client_socket_addr, server_socket_addr),
866866
kind: UdpRequestKind::Announce,
867867
}))

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub async fn handle_connect(
2424

2525
if let Some(udp_server_stats_event_sender) = opt_udp_server_stats_event_sender.as_deref() {
2626
udp_server_stats_event_sender
27-
.send_event(server_statistics::event::Event::UdpRequest {
27+
.send_event(server_statistics::event::Event::UdpRequestAccepted {
2828
context: ConnectionContext::new(client_socket_addr, server_socket_addr),
2929
kind: UdpRequestKind::Connect,
3030
})
@@ -203,7 +203,7 @@ mod tests {
203203
let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
204204
udp_server_stats_event_sender_mock
205205
.expect_send_event()
206-
.with(eq(server_statistics::event::Event::UdpRequest {
206+
.with(eq(server_statistics::event::Event::UdpRequestAccepted {
207207
context: server_statistics::event::ConnectionContext::new(client_socket_addr, server_socket_addr),
208208
kind: UdpRequestKind::Connect,
209209
}))
@@ -244,7 +244,7 @@ mod tests {
244244
let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
245245
udp_server_stats_event_sender_mock
246246
.expect_send_event()
247-
.with(eq(server_statistics::event::Event::UdpRequest {
247+
.with(eq(server_statistics::event::Event::UdpRequestAccepted {
248248
context: server_statistics::event::ConnectionContext::new(client_socket_addr, server_socket_addr),
249249
kind: UdpRequestKind::Connect,
250250
}))

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub async fn handle_scrape(
3838

3939
if let Some(udp_server_stats_event_sender) = opt_udp_server_stats_event_sender.as_deref() {
4040
udp_server_stats_event_sender
41-
.send_event(server_statistics::event::Event::UdpRequest {
41+
.send_event(server_statistics::event::Event::UdpRequestAccepted {
4242
context: ConnectionContext::new(client_socket_addr, server_socket_addr),
4343
kind: UdpRequestKind::Scrape,
4444
})
@@ -368,7 +368,7 @@ mod tests {
368368
let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
369369
udp_server_stats_event_sender_mock
370370
.expect_send_event()
371-
.with(eq(server_statistics::event::Event::UdpRequest {
371+
.with(eq(server_statistics::event::Event::UdpRequestAccepted {
372372
context: ConnectionContext::new(client_socket_addr, server_socket_addr),
373373
kind: server_statistics::event::UdpRequestKind::Scrape,
374374
}))
@@ -417,7 +417,7 @@ mod tests {
417417
let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
418418
udp_server_stats_event_sender_mock
419419
.expect_send_event()
420-
.with(eq(server_statistics::event::Event::UdpRequest {
420+
.with(eq(server_statistics::event::Event::UdpRequestAccepted {
421421
context: ConnectionContext::new(client_socket_addr, server_socket_addr),
422422
kind: server_statistics::event::UdpRequestKind::Scrape,
423423
}))

‎packages/udp-tracker-server/src/statistics/event/handler.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub async fn handle_event(event: Event, stats_repository: &Repository) {
2222
stats_repository.increase_udp6_requests().await;
2323
}
2424
},
25-
Event::UdpRequest { context, kind } => match kind {
25+
Event::UdpRequestAccepted { context, kind } => match kind {
2626
UdpRequestKind::Connect => match context.client_socket_addr().ip() {
2727
std::net::IpAddr::V4(_) => {
2828
stats_repository.increase_udp4_connections().await;
@@ -204,7 +204,7 @@ mod tests {
204204
let stats_repository = Repository::new();
205205

206206
handle_event(
207-
Event::UdpRequest {
207+
Event::UdpRequestAccepted {
208208
context: ConnectionContext::new(
209209
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
210210
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
@@ -225,7 +225,7 @@ mod tests {
225225
let stats_repository = Repository::new();
226226

227227
handle_event(
228-
Event::UdpRequest {
228+
Event::UdpRequestAccepted {
229229
context: ConnectionContext::new(
230230
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
231231
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
@@ -246,7 +246,7 @@ mod tests {
246246
let stats_repository = Repository::new();
247247

248248
handle_event(
249-
Event::UdpRequest {
249+
Event::UdpRequestAccepted {
250250
context: ConnectionContext::new(
251251
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
252252
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
@@ -311,7 +311,7 @@ mod tests {
311311
let stats_repository = Repository::new();
312312

313313
handle_event(
314-
Event::UdpRequest {
314+
Event::UdpRequestAccepted {
315315
context: ConnectionContext::new(
316316
SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
317317
SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
@@ -332,7 +332,7 @@ mod tests {
332332
let stats_repository = Repository::new();
333333

334334
handle_event(
335-
Event::UdpRequest {
335+
Event::UdpRequestAccepted {
336336
context: ConnectionContext::new(
337337
SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
338338
SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
@@ -353,7 +353,7 @@ mod tests {
353353
let stats_repository = Repository::new();
354354

355355
handle_event(
356-
Event::UdpRequest {
356+
Event::UdpRequestAccepted {
357357
context: ConnectionContext::new(
358358
SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
359359
SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),

‎packages/udp-tracker-server/src/statistics/event/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub enum Event {
1717
UdpRequestBanned {
1818
context: ConnectionContext,
1919
},
20-
UdpRequest {
20+
UdpRequestAccepted {
2121
context: ConnectionContext,
2222
kind: UdpRequestKind,
2323
},

0 commit comments

Comments
 (0)