refactor: [#1270] extract fn to new package udp-protocol

.github/workflows/deployment.yaml

@@ -58,6 +58,7 @@ jobs:
           cargo publish -p bittorrent-http-protocol
           cargo publish -p bittorrent-tracker-client
           cargo publish -p bittorrent-tracker-core
+          cargo publish -p bittorrent-udp-protocol
           cargo publish -p torrust-tracker
           cargo publish -p torrust-tracker-api-client
           cargo publish -p torrust-tracker-client

Cargo.toml

@@ -43,6 +43,7 @@ bittorrent-http-protocol = { version = "3.0.0-develop", path = "packages/http-pr
 bittorrent-primitives = "0.1.0"
 bittorrent-tracker-client = { version = "3.0.0-develop", path = "packages/tracker-client" }
 bittorrent-tracker-core = { version = "3.0.0-develop", path = "packages/tracker-core" }
+bittorrent-udp-protocol = { version = "3.0.0-develop", path = "packages/udp-protocol" }
 bloom = "0.3.2"
 blowfish = "0"
 camino = { version = "1", features = ["serde", "serde1"] }

packages/udp-protocol/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+description = "A library with the primitive types and functions for the BitTorrent UDP tracker protocol."
+keywords = ["bittorrent", "library", "primitives", "udp"]
+name = "bittorrent-udp-protocol"
+readme = "README.md"
+
+authors.workspace = true
+documentation.workspace = true
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+publish.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
+
+[dependencies]
+aquatic_udp_protocol = "0"
+torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
+torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }

packages/udp-protocol/README.md

@@ -0,0 +1,11 @@
+# BitTorrent UDP Tracker Protocol
+
+A library with the primitive types and functions used by BitTorrent UDP trackers.
+
+## Documentation
+
+[Crate documentation](https://docs.rs/bittorrent-udp-protocol).
+
+## License
+
+The project is licensed under the terms of the [GNU AFFERO GENERAL PUBLIC LICENSE](./LICENSE).

packages/udp-protocol/src/lib.rs

@@ -0,0 +1,15 @@
+//! Primitive types and functions for `BitTorrent` UDP trackers.
+pub mod peer_builder;
+
+use torrust_tracker_clock::clock;
+
+/// This code needs to be copied into each crate.
+/// Working version, for production.
+#[cfg(not(test))]
+#[allow(dead_code)]
+pub(crate) type CurrentClock = clock::Working;
+
+/// Stopped version, for testing.
+#[cfg(test)]
+#[allow(dead_code)]
+pub(crate) type CurrentClock = clock::Stopped;

src/packages/udp_tracker_core/mod.rs

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

src/packages/udp_tracker_core/services/announce.rs

@@ -15,10 +15,11 @@ use bittorrent_primitives::info_hash::InfoHash;
 use bittorrent_tracker_core::announce_handler::{AnnounceHandler, PeersWanted};
 use bittorrent_tracker_core::error::AnnounceError;
 use bittorrent_tracker_core::whitelist;
+use bittorrent_udp_protocol::peer_builder;
 use torrust_tracker_primitives::core::AnnounceData;
 use torrust_tracker_primitives::peer;
 
-use crate::packages::udp_tracker_core::{self, peer_builder};
+use crate::packages::udp_tracker_core::{self};
 
 /// It handles the `Announce` request.
 ///

src/servers/udp/handlers/announce.rs

@@ -261,6 +261,7 @@ mod tests {
                 let expected_peer = TorrentPeerBuilder::new()
                     .with_peer_id(peer_id)
                     .with_peer_address(SocketAddr::new(IpAddr::V4(client_ip), client_port))
+                    .updated_on(peers[0].updated)
                     .into();
 
                 assert_eq!(peers[0], Arc::new(expected_peer));
@@ -495,6 +496,7 @@ mod tests {
                     let expected_peer = TorrentPeerBuilder::new()
                         .with_peer_id(peer_id)
                         .with_peer_address(SocketAddr::new(external_ip_in_tracker_configuration, client_port))
+                        .updated_on(peers[0].updated)
                         .into();
 
                     assert_eq!(peers[0], Arc::new(expected_peer));
@@ -567,6 +569,7 @@ mod tests {
                 let expected_peer = TorrentPeerBuilder::new()
                     .with_peer_id(peer_id)
                     .with_peer_address(SocketAddr::new(IpAddr::V6(client_ip_v6), client_port))
+                    .updated_on(peers[0].updated)
                     .into();
 
                 assert_eq!(peers[0], Arc::new(expected_peer));

src/servers/udp/handlers/mod.rs

@@ -196,7 +196,7 @@ pub(crate) mod tests {
     use tokio::sync::mpsc::error::SendError;
     use torrust_tracker_clock::clock::Time;
     use torrust_tracker_configuration::{Configuration, Core};
-    use torrust_tracker_primitives::peer;
+    use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
     use torrust_tracker_test_helpers::configuration;
 
     use super::gen_remote_fingerprint;
@@ -330,6 +330,12 @@ pub(crate) mod tests {
             self
         }
 
+        #[must_use]
+        pub fn updated_on(mut self, updated: DurationSinceUnixEpoch) -> Self {
+            self.peer.updated = updated;
+            self
+        }
+
         #[must_use]
         pub fn into(self) -> peer::Peer {
             self.peer