refactor: [#1275] move conenction cookie to udp_tracker_core package

src/servers/udp/connection_cookie.rs → src/packages/udp_tracker_core/connection_cookie.rs

@@ -79,12 +79,25 @@
 
 use aquatic_udp_protocol::ConnectionId as Cookie;
 use cookie_builder::{assemble, decode, disassemble, encode};
+use thiserror::Error;
 use tracing::instrument;
 use zerocopy::AsBytes;
 
-use crate::servers::udp::error::ConnectionCookieError;
 use crate::shared::crypto::keys::CipherArrayBlowfish;
 
+/// Error returned when there was an error with the connection cookie.
+#[derive(Error, Debug)]
+pub enum ConnectionCookieError {
+    #[error("cookie value is not normal: {not_normal_value}")]
+    ValueNotNormal { not_normal_value: f64 },
+
+    #[error("cookie value is expired: {expired_value}, expected > {min_value}")]
+    ValueExpired { expired_value: f64, min_value: f64 },
+
+    #[error("cookie value is from future: {future_value}, expected < {max_value}")]
+    ValueFromFuture { future_value: f64, max_value: f64 },
+}
+
 /// Generates a new connection cookie.
 ///
 /// # Errors

src/packages/udp_tracker_core/mod.rs

@@ -1,2 +1,3 @@
+pub mod connection_cookie;
 pub mod services;
 pub mod statistics;

src/servers/udp/error.rs

@@ -6,6 +6,8 @@ use derive_more::derive::Display;
 use thiserror::Error;
 use torrust_tracker_located_error::LocatedError;
 
+use crate::packages::udp_tracker_core::connection_cookie::ConnectionCookieError;
+
 #[derive(Display, Debug)]
 #[display(":?")]
 pub struct ConnectionCookie(pub ConnectionId);
@@ -44,19 +46,6 @@ pub enum Error {
     TrackerAuthenticationRequired { location: &'static Location<'static> },
 }
 
-/// Error returned when there was an error with the connection cookie.
-#[derive(Error, Debug)]
-pub enum ConnectionCookieError {
-    #[error("cookie value is not normal: {not_normal_value}")]
-    ValueNotNormal { not_normal_value: f64 },
-
-    #[error("cookie value is expired: {expired_value}, expected > {min_value}")]
-    ValueExpired { expired_value: f64, min_value: f64 },
-
-    #[error("cookie value is from future: {future_value}, expected < {max_value}")]
-    ValueFromFuture { future_value: f64, max_value: f64 },
-}
-
 impl From<RequestParseError> for Error {
     fn from(request_parse_error: RequestParseError) -> Self {
         Self::RequestParseError { request_parse_error }

src/servers/udp/handlers/announce.rs

@@ -14,8 +14,8 @@ use torrust_tracker_configuration::Core;
 use tracing::{instrument, Level};
 use zerocopy::network_endian::I32;
 
+use crate::packages::udp_tracker_core::connection_cookie::check;
 use crate::packages::udp_tracker_core::{self};
-use crate::servers::udp::connection_cookie::check;
 use crate::servers::udp::error::Error;
 use crate::servers::udp::handlers::gen_remote_fingerprint;
 
@@ -134,7 +134,7 @@ mod tests {
             PeerId as AquaticPeerId, PeerKey, Port, TransactionId,
         };
 
-        use crate::servers::udp::connection_cookie::make;
+        use crate::packages::udp_tracker_core::connection_cookie::make;
         use crate::servers::udp::handlers::tests::{sample_ipv4_remote_addr_fingerprint, sample_issue_time};
 
         struct AnnounceRequestBuilder {
@@ -213,8 +213,8 @@ mod tests {
             use mockall::predicate::eq;
             use torrust_tracker_configuration::Core;
 
+            use crate::packages::udp_tracker_core::connection_cookie::make;
             use crate::packages::{self, udp_tracker_core};
-            use crate::servers::udp::connection_cookie::make;
             use crate::servers::udp::handlers::announce::tests::announce_request::AnnounceRequestBuilder;
             use crate::servers::udp::handlers::tests::{
                 initialize_core_tracker_services_for_default_tracker_configuration,
@@ -447,7 +447,7 @@ mod tests {
 
                 use aquatic_udp_protocol::{InfoHash as AquaticInfoHash, PeerId as AquaticPeerId};
 
-                use crate::servers::udp::connection_cookie::make;
+                use crate::packages::udp_tracker_core::connection_cookie::make;
                 use crate::servers::udp::handlers::announce::tests::announce_request::AnnounceRequestBuilder;
                 use crate::servers::udp::handlers::tests::{
                     initialize_core_tracker_services_for_public_tracker, sample_cookie_valid_range, sample_issue_time,
@@ -520,8 +520,8 @@ mod tests {
             use mockall::predicate::eq;
             use torrust_tracker_configuration::Core;
 
+            use crate::packages::udp_tracker_core::connection_cookie::make;
             use crate::packages::{self, udp_tracker_core};
-            use crate::servers::udp::connection_cookie::make;
             use crate::servers::udp::handlers::announce::tests::announce_request::AnnounceRequestBuilder;
             use crate::servers::udp::handlers::tests::{
                 initialize_core_tracker_services_for_default_tracker_configuration,
@@ -776,7 +776,7 @@ mod tests {
                 use mockall::predicate::eq;
 
                 use crate::packages::udp_tracker_core;
-                use crate::servers::udp::connection_cookie::make;
+                use crate::packages::udp_tracker_core::connection_cookie::make;
                 use crate::servers::udp::handlers::announce::tests::announce_request::AnnounceRequestBuilder;
                 use crate::servers::udp::handlers::tests::{
                     sample_cookie_valid_range, sample_issue_time, MockUdpStatsEventSender, TrackerConfigurationBuilder,

src/servers/udp/handlers/connect.rs

@@ -6,7 +6,7 @@ use aquatic_udp_protocol::{ConnectRequest, ConnectResponse, Response};
 use tracing::{instrument, Level};
 
 use crate::packages::udp_tracker_core;
-use crate::servers::udp::connection_cookie::make;
+use crate::packages::udp_tracker_core::connection_cookie::make;
 use crate::servers::udp::handlers::gen_remote_fingerprint;
 
 /// It handles the `Connect` request. Refer to [`Connect`](crate::servers::udp#connect)
@@ -62,8 +62,8 @@ mod tests {
         use aquatic_udp_protocol::{ConnectRequest, ConnectResponse, Response, TransactionId};
         use mockall::predicate::eq;
 
+        use crate::packages::udp_tracker_core::connection_cookie::make;
         use crate::packages::{self, udp_tracker_core};
-        use crate::servers::udp::connection_cookie::make;
         use crate::servers::udp::handlers::handle_connect;
         use crate::servers::udp::handlers::tests::{
             sample_ipv4_remote_addr, sample_ipv4_remote_addr_fingerprint, sample_ipv4_socket_address, sample_ipv6_remote_addr,

src/servers/udp/handlers/error.rs

@@ -9,7 +9,7 @@ use uuid::Uuid;
 use zerocopy::network_endian::I32;
 
 use crate::packages::udp_tracker_core;
-use crate::servers::udp::connection_cookie::check;
+use crate::packages::udp_tracker_core::connection_cookie::check;
 use crate::servers::udp::error::Error;
 use crate::servers::udp::handlers::gen_remote_fingerprint;
 use crate::servers::udp::UDP_TRACKER_LOG_TARGET;

src/servers/udp/handlers/scrape.rs

@@ -11,7 +11,7 @@ use tracing::{instrument, Level};
 use zerocopy::network_endian::I32;
 
 use crate::packages::udp_tracker_core;
-use crate::servers::udp::connection_cookie::check;
+use crate::packages::udp_tracker_core::connection_cookie::check;
 use crate::servers::udp::error::Error;
 use crate::servers::udp::handlers::gen_remote_fingerprint;
 
@@ -94,7 +94,7 @@ mod tests {
         use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
 
         use crate::packages;
-        use crate::servers::udp::connection_cookie::make;
+        use crate::packages::udp_tracker_core::connection_cookie::make;
         use crate::servers::udp::handlers::tests::{
             initialize_core_tracker_services_for_public_tracker, sample_cookie_valid_range, sample_ipv4_remote_addr,
             sample_issue_time, TorrentPeerBuilder,

src/servers/udp/mod.rs

@@ -637,7 +637,6 @@
 
 use std::net::SocketAddr;
 
-pub mod connection_cookie;
 pub mod error;
 pub mod handlers;
 pub mod server;