refactor(http): [#160] reorganize dirs for Axum and Warp HTTP tracker…

… implementations We are going to start sharing code bettween both implementation (Warp and Axum). We need to keep common code separated because Warp implementation will be removed when Axum implementation is finished.
torrust · Feb 9, 2023 · 995397e · 995397e
1 parent 9c25feb
commit 995397e
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 19 deletions.
diff --git a/src/http/axum/extractors.rs → src/http/axum_implementation/extractors.rs b/src/http/axum/extractors.rs → src/http/axum_implementation/extractors.rs
@@ -135,7 +135,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::AnnounceParams;
-    use crate::http::axum::query::Query;
+    use crate::http::axum_implementation::query::Query;
     use crate::protocol::info_hash::InfoHash;
     use crate::tracker::peer;
 

diff --git a/src/http/axum/handlers.rs → src/http/axum_implementation/handlers.rs b/src/http/axum/handlers.rs → src/http/axum_implementation/handlers.rs
diff --git a/src/http/axum/mod.rs → src/http/axum_implementation/mod.rs b/src/http/axum/mod.rs → src/http/axum_implementation/mod.rs
diff --git a/src/http/axum/query.rs → src/http/axum_implementation/query.rs b/src/http/axum/query.rs → src/http/axum_implementation/query.rs
@@ -69,7 +69,7 @@ impl Query {
 #[cfg(test)]
 mod tests {
     use super::Query;
-    use crate::http::axum::query::Param;
+    use crate::http::axum_implementation::query::Param;
 
     #[test]
     fn it_should_parse_the_query_params_from_an_url_query_string() {

diff --git a/src/http/axum/resources/mod.rs → ...http/axum_implementation/resources/mod.rs b/src/http/axum/resources/mod.rs → ...http/axum_implementation/resources/mod.rs
diff --git a/src/http/axum/resources/ok.rs → src/http/axum_implementation/resources/ok.rs b/src/http/axum/resources/ok.rs → src/http/axum_implementation/resources/ok.rs
diff --git a/src/http/axum/responses.rs → src/http/axum_implementation/responses.rs b/src/http/axum/responses.rs → src/http/axum_implementation/responses.rs
diff --git a/src/http/axum/routes.rs → src/http/axum_implementation/routes.rs b/src/http/axum/routes.rs → src/http/axum_implementation/routes.rs
diff --git a/src/http/axum/server.rs → src/http/axum_implementation/server.rs b/src/http/axum/server.rs → src/http/axum_implementation/server.rs
diff --git a/src/http/mod.rs b/src/http/mod.rs
@@ -11,18 +11,10 @@
 //!
 
 use serde::{Deserialize, Serialize};
-pub mod axum;
-pub mod error;
-pub mod filters;
-pub mod handlers;
-pub mod percent_encoding;
-pub mod request;
-pub mod response;
-pub mod routes;
-pub mod server;
 
-pub type Bytes = u64;
-pub type WebResult<T> = std::result::Result<T, warp::Rejection>;
+pub mod axum_implementation;
+pub mod percent_encoding;
+pub mod warp_implementation;
 
 #[derive(Serialize, Deserialize, Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Version {

diff --git a/src/http/error.rs → src/http/warp_implementation/error.rs b/src/http/error.rs → src/http/warp_implementation/error.rs
diff --git a/src/http/filters.rs → src/http/warp_implementation/filters.rs b/src/http/filters.rs → src/http/warp_implementation/filters.rs
@@ -7,8 +7,8 @@ use std::sync::Arc;
 use warp::{reject, Filter, Rejection};
 
 use super::error::Error;
-use super::percent_encoding::{percent_decode_info_hash, percent_decode_peer_id};
 use super::{request, WebResult};
+use crate::http::percent_encoding::{percent_decode_info_hash, percent_decode_peer_id};
 use crate::protocol::common::MAX_SCRAPE_TORRENTS;
 use crate::protocol::info_hash::InfoHash;
 use crate::tracker::{self, auth, peer};

diff --git a/src/http/handlers.rs → src/http/warp_implementation/handlers.rs b/src/http/handlers.rs → src/http/warp_implementation/handlers.rs
diff --git a/src/http/warp_implementation/mod.rs b/src/http/warp_implementation/mod.rs
@@ -0,0 +1,12 @@
+use warp::Rejection;
+
+pub mod error;
+pub mod filters;
+pub mod handlers;
+pub mod request;
+pub mod response;
+pub mod routes;
+pub mod server;
+
+pub type Bytes = u64;
+pub type WebResult<T> = std::result::Result<T, Rejection>;
diff --git a/src/http/request.rs → src/http/warp_implementation/request.rs b/src/http/request.rs → src/http/warp_implementation/request.rs
@@ -2,7 +2,7 @@ use std::net::IpAddr;
 
 use serde::Deserialize;
 
-use crate::http::Bytes;
+use crate::http::warp_implementation::Bytes;
 use crate::protocol::info_hash::InfoHash;
 use crate::tracker::peer;
 

diff --git a/src/http/response.rs → src/http/warp_implementation/response.rs b/src/http/response.rs → src/http/warp_implementation/response.rs
diff --git a/src/http/routes.rs → src/http/warp_implementation/routes.rs b/src/http/routes.rs → src/http/warp_implementation/routes.rs
diff --git a/src/http/server.rs → src/http/warp_implementation/server.rs b/src/http/server.rs → src/http/warp_implementation/server.rs
diff --git a/src/jobs/http_tracker.rs b/src/jobs/http_tracker.rs
@@ -7,8 +7,8 @@ use tokio::sync::oneshot;
 use tokio::task::JoinHandle;
 
 use crate::config::HttpTracker;
-use crate::http::axum::server;
-use crate::http::server::Http;
+use crate::http::axum_implementation::server;
+use crate::http::warp_implementation::server::Http;
 use crate::http::Version;
 use crate::tracker;
 

diff --git a/src/tracker/peer.rs b/src/tracker/peer.rs
@@ -6,7 +6,7 @@ use serde;
 use serde::Serialize;
 use thiserror::Error;
 
-use crate::http::request::Announce;
+use crate::http::warp_implementation::request::Announce;
 use crate::protocol::clock::{Current, DurationSinceUnixEpoch, Time};
 use crate::protocol::common::{AnnounceEventDef, NumberOfBytesDef};
 use crate::protocol::utils::ser_unix_time_value;
@@ -599,7 +599,7 @@ mod test {
     mod torrent_peer_constructor_from_for_http_requests {
         use std::net::{IpAddr, Ipv4Addr};
 
-        use crate::http::request::Announce;
+        use crate::http::warp_implementation::request::Announce;
         use crate::protocol::info_hash::InfoHash;
         use crate::tracker::peer::{self, Peer};