From 129fd2f26549fec74f0bf76b4b11b2c2a3a3c9f7 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Wed, 17 Jan 2024 11:08:43 +0000 Subject: [PATCH] refactor: move upd tracker client to follow same folder strucutre as the HTTP tracker client. --- src/servers/health_check_api/handlers.rs | 2 +- src/servers/udp/server.rs | 2 +- src/shared/bit_torrent/mod.rs | 1 - src/shared/bit_torrent/tracker/mod.rs | 1 + src/shared/bit_torrent/{ => tracker}/udp/client.rs | 2 +- src/shared/bit_torrent/{ => tracker}/udp/mod.rs | 0 tests/servers/udp/contract.rs | 10 +++++----- 7 files changed, 9 insertions(+), 9 deletions(-) rename src/shared/bit_torrent/{ => tracker}/udp/client.rs (97%) rename src/shared/bit_torrent/{ => tracker}/udp/mod.rs (100%) diff --git a/src/servers/health_check_api/handlers.rs b/src/servers/health_check_api/handlers.rs index 2f47c8607..4403676af 100644 --- a/src/servers/health_check_api/handlers.rs +++ b/src/servers/health_check_api/handlers.rs @@ -8,7 +8,7 @@ use torrust_tracker_configuration::{Configuration, HttpApi, HttpTracker, UdpTrac use super::resources::Report; use super::responses; -use crate::shared::bit_torrent::udp::client::new_udp_tracker_client_connected; +use crate::shared::bit_torrent::tracker::udp::client::new_udp_tracker_client_connected; /// If port 0 is specified in the configuration the OS will automatically /// assign a free port. But we do now know in from the configuration. diff --git a/src/servers/udp/server.rs b/src/servers/udp/server.rs index a15226bd2..001603b08 100644 --- a/src/servers/udp/server.rs +++ b/src/servers/udp/server.rs @@ -34,7 +34,7 @@ use crate::bootstrap::jobs::Started; use crate::core::Tracker; use crate::servers::signals::{shutdown_signal_with_message, Halted}; use crate::servers::udp::handlers::handle_packet; -use crate::shared::bit_torrent::udp::MAX_PACKET_SIZE; +use crate::shared::bit_torrent::tracker::udp::MAX_PACKET_SIZE; /// Error that can occur when starting or stopping the UDP server. /// diff --git a/src/shared/bit_torrent/mod.rs b/src/shared/bit_torrent/mod.rs index 3dcf705e4..8074661be 100644 --- a/src/shared/bit_torrent/mod.rs +++ b/src/shared/bit_torrent/mod.rs @@ -70,4 +70,3 @@ pub mod common; pub mod info_hash; pub mod tracker; -pub mod udp; diff --git a/src/shared/bit_torrent/tracker/mod.rs b/src/shared/bit_torrent/tracker/mod.rs index 3883215fc..b08eaa622 100644 --- a/src/shared/bit_torrent/tracker/mod.rs +++ b/src/shared/bit_torrent/tracker/mod.rs @@ -1 +1,2 @@ pub mod http; +pub mod udp; diff --git a/src/shared/bit_torrent/udp/client.rs b/src/shared/bit_torrent/tracker/udp/client.rs similarity index 97% rename from src/shared/bit_torrent/udp/client.rs rename to src/shared/bit_torrent/tracker/udp/client.rs index d5c4c9adf..5ea982663 100644 --- a/src/shared/bit_torrent/udp/client.rs +++ b/src/shared/bit_torrent/tracker/udp/client.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use aquatic_udp_protocol::{Request, Response}; use tokio::net::UdpSocket; -use crate::shared::bit_torrent::udp::{source_address, MAX_PACKET_SIZE}; +use crate::shared::bit_torrent::tracker::udp::{source_address, MAX_PACKET_SIZE}; #[allow(clippy::module_name_repetitions)] pub struct UdpClient { diff --git a/src/shared/bit_torrent/udp/mod.rs b/src/shared/bit_torrent/tracker/udp/mod.rs similarity index 100% rename from src/shared/bit_torrent/udp/mod.rs rename to src/shared/bit_torrent/tracker/udp/mod.rs diff --git a/tests/servers/udp/contract.rs b/tests/servers/udp/contract.rs index 72124fc3f..b16a47cd3 100644 --- a/tests/servers/udp/contract.rs +++ b/tests/servers/udp/contract.rs @@ -6,8 +6,8 @@ use core::panic; use aquatic_udp_protocol::{ConnectRequest, ConnectionId, Response, TransactionId}; -use torrust_tracker::shared::bit_torrent::udp::client::{new_udp_client_connected, UdpTrackerClient}; -use torrust_tracker::shared::bit_torrent::udp::MAX_PACKET_SIZE; +use torrust_tracker::shared::bit_torrent::tracker::udp::client::{new_udp_client_connected, UdpTrackerClient}; +use torrust_tracker::shared::bit_torrent::tracker::udp::MAX_PACKET_SIZE; use torrust_tracker_test_helpers::configuration; use crate::servers::udp::asserts::is_error_response; @@ -51,7 +51,7 @@ async fn should_return_a_bad_request_response_when_the_client_sends_an_empty_req mod receiving_a_connection_request { use aquatic_udp_protocol::{ConnectRequest, TransactionId}; - use torrust_tracker::shared::bit_torrent::udp::client::new_udp_tracker_client_connected; + use torrust_tracker::shared::bit_torrent::tracker::udp::client::new_udp_tracker_client_connected; use torrust_tracker_test_helpers::configuration; use crate::servers::udp::asserts::is_connect_response; @@ -82,7 +82,7 @@ mod receiving_an_announce_request { AnnounceEvent, AnnounceRequest, ConnectionId, InfoHash, NumberOfBytes, NumberOfPeers, PeerId, PeerKey, Port, TransactionId, }; - use torrust_tracker::shared::bit_torrent::udp::client::new_udp_tracker_client_connected; + use torrust_tracker::shared::bit_torrent::tracker::udp::client::new_udp_tracker_client_connected; use torrust_tracker_test_helpers::configuration; use crate::servers::udp::asserts::is_ipv4_announce_response; @@ -124,7 +124,7 @@ mod receiving_an_announce_request { mod receiving_an_scrape_request { use aquatic_udp_protocol::{ConnectionId, InfoHash, ScrapeRequest, TransactionId}; - use torrust_tracker::shared::bit_torrent::udp::client::new_udp_tracker_client_connected; + use torrust_tracker::shared::bit_torrent::tracker::udp::client::new_udp_tracker_client_connected; use torrust_tracker_test_helpers::configuration; use crate::servers::udp::asserts::is_scrape_response;