refactor: rename mnd extract mods

`protocol` nod contains logic not only for BitTorrent protocol.

Author: josecelano

src/lib.rs

@@ -1,7 +1,7 @@
 pub mod app;
 pub mod bootstrap;
-pub mod protocol;
 pub mod servers;
+pub mod shared;
 pub mod tracker;
 
 #[macro_use]

src/protocol/mod.rs

@@ -2,7 +2,7 @@ use std::convert::From;
 
 use serde::{Deserialize, Serialize};
 
-use crate::protocol::clock::convert_from_iso_8601_to_timestamp;
+use crate::shared::clock::convert_from_iso_8601_to_timestamp;
 use crate::tracker::auth::{self, Key};
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
@@ -36,7 +36,7 @@ mod tests {
     use std::time::Duration;
 
     use super::AuthKey;
-    use crate::protocol::clock::{Current, TimeNow};
+    use crate::shared::clock::{Current, TimeNow};
     use crate::tracker::auth::{self, Key};
 
     struct TestTime {

src/servers/apis/v1/context/auth_key/resources.rs

@@ -8,9 +8,9 @@ use serde::{de, Deserialize, Deserializer};
 
 use super::resources::torrent::ListItem;
 use super::responses::{torrent_info_response, torrent_list_response, torrent_not_known_response};
-use crate::protocol::info_hash::InfoHash;
 use crate::servers::apis::v1::responses::invalid_info_hash_param_response;
 use crate::servers::apis::InfoHashParam;
+use crate::shared::bit_torrent::info_hash::InfoHash;
 use crate::tracker::services::torrent::{get_torrent_info, get_torrents, Pagination};
 use crate::tracker::Tracker;
 

src/servers/apis/v1/context/torrent/handlers.rs

@@ -75,10 +75,10 @@ mod tests {
     use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};
 
     use super::Torrent;
-    use crate::protocol::clock::DurationSinceUnixEpoch;
-    use crate::protocol::info_hash::InfoHash;
     use crate::servers::apis::v1::context::torrent::resources::peer::Peer;
     use crate::servers::apis::v1::context::torrent::resources::torrent::ListItem;
+    use crate::shared::bit_torrent::info_hash::InfoHash;
+    use crate::shared::clock::DurationSinceUnixEpoch;
     use crate::tracker::peer;
     use crate::tracker::services::torrent::{BasicInfo, Info};
 

src/servers/apis/v1/context/torrent/resources/torrent.rs

@@ -7,9 +7,9 @@ use axum::response::Response;
 use super::responses::{
     failed_to_reload_whitelist_response, failed_to_remove_torrent_from_whitelist_response, failed_to_whitelist_torrent_response,
 };
-use crate::protocol::info_hash::InfoHash;
 use crate::servers::apis::v1::responses::{invalid_info_hash_param_response, ok_response};
 use crate::servers::apis::InfoHashParam;
+use crate::shared::bit_torrent::info_hash::InfoHash;
 use crate::tracker::Tracker;
 
 pub async fn add_torrent_to_whitelist_handler(

src/servers/apis/v1/context/whitelist/handlers.rs

@@ -1,4 +1,4 @@
-use crate::protocol::info_hash::{ConversionError, InfoHash};
+use crate::shared::bit_torrent::info_hash::{ConversionError, InfoHash};
 use crate::tracker::peer::{self, IdConversionError};
 
 /// # Errors
@@ -21,8 +21,8 @@ pub fn percent_decode_peer_id(raw_peer_id: &str) -> Result<peer::Id, IdConversio
 mod tests {
     use std::str::FromStr;
 
-    use crate::protocol::info_hash::InfoHash;
     use crate::servers::http::percent_encoding::{percent_decode_info_hash, percent_decode_peer_id};
+    use crate::shared::bit_torrent::info_hash::InfoHash;
     use crate::tracker::peer;
 
     #[test]

src/servers/http/percent_encoding.rs

@@ -53,9 +53,9 @@ mod tests {
     use std::str::FromStr;
 
     use super::extract_announce_from;
-    use crate::protocol::info_hash::InfoHash;
     use crate::servers::http::v1::requests::announce::{Announce, Compact, Event};
     use crate::servers::http::v1::responses::error::Error;
+    use crate::shared::bit_torrent::info_hash::InfoHash;
     use crate::tracker::peer;
 
     fn assert_error_response(error: &Error, error_message: &str) {

src/servers/http/v1/extractors/announce_request.rs

@@ -53,9 +53,9 @@ mod tests {
     use std::str::FromStr;
 
     use super::extract_scrape_from;
-    use crate::protocol::info_hash::InfoHash;
     use crate::servers::http::v1::requests::scrape::Scrape;
     use crate::servers::http::v1::responses::error::Error;
+    use crate::shared::bit_torrent::info_hash::InfoHash;
 
     struct TestInfoHash {
         pub bencoded: String,

src/servers/http/v1/extractors/scrape_request.rs

@@ -7,7 +7,6 @@ use axum::extract::State;
 use axum::response::{IntoResponse, Response};
 use log::debug;
 
-use crate::protocol::clock::{Current, Time};
 use crate::servers::http::v1::extractors::announce_request::ExtractRequest;
 use crate::servers::http::v1::extractors::authentication_key::Extract as ExtractKey;
 use crate::servers::http::v1::extractors::client_ip_sources::Extract as ExtractClientIpSources;
@@ -16,6 +15,7 @@ use crate::servers::http::v1::requests::announce::{Announce, Compact, Event};
 use crate::servers::http::v1::responses::{self, announce};
 use crate::servers::http::v1::services::peer_ip_resolver::ClientIpSources;
 use crate::servers::http::v1::services::{self, peer_ip_resolver};
+use crate::shared::clock::{Current, Time};
 use crate::tracker::auth::Key;
 use crate::tracker::peer::Peer;
 use crate::tracker::{AnnounceData, Tracker};
@@ -141,10 +141,10 @@ mod tests {
 
     use torrust_tracker_test_helpers::configuration;
 
-    use crate::protocol::info_hash::InfoHash;
     use crate::servers::http::v1::requests::announce::Announce;
     use crate::servers::http::v1::responses;
     use crate::servers::http::v1::services::peer_ip_resolver::ClientIpSources;
+    use crate::shared::bit_torrent::info_hash::InfoHash;
     use crate::tracker::services::common::tracker_factory;
     use crate::tracker::{peer, Tracker};