From c424ffb0777d6d55783aada7a7cd3d87054e2a98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Sun, 3 Apr 2022 00:51:07 +0200
Subject: [PATCH] http_private: move all code in workers::common to common

---
 aquatic_http_private/src/common.rs          | 12 ++++++++----
 aquatic_http_private/src/workers/common.rs  | 12 ------------
 aquatic_http_private/src/workers/mod.rs     |  1 -
 aquatic_http_private/src/workers/request.rs |  3 +--
 4 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 aquatic_http_private/src/workers/common.rs

diff --git a/aquatic_http_private/src/common.rs b/aquatic_http_private/src/common.rs
index 6b00a47..092d09a 100644
--- a/aquatic_http_private/src/common.rs
+++ b/aquatic_http_private/src/common.rs
@@ -3,10 +3,14 @@ use tokio::sync::{mpsc, oneshot};
 use aquatic_common::CanonicalSocketAddr;
 use aquatic_http_protocol::{common::InfoHash, response::Response};
 
-use crate::{
-    config::Config,
-    workers::{common::ChannelAnnounceRequest, socket::db::ValidatedAnnounceRequest},
-};
+use crate::{config::Config, workers::socket::db::ValidatedAnnounceRequest};
+
+#[derive(Debug)]
+pub struct ChannelAnnounceRequest {
+    pub request: ValidatedAnnounceRequest,
+    pub source_addr: CanonicalSocketAddr,
+    pub response_sender: oneshot::Sender<Response>,
+}
 
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
 pub struct RequestWorkerIndex(pub usize);
diff --git a/aquatic_http_private/src/workers/common.rs b/aquatic_http_private/src/workers/common.rs
deleted file mode 100644
index 558bf07..0000000
--- a/aquatic_http_private/src/workers/common.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use aquatic_common::CanonicalSocketAddr;
-use aquatic_http_protocol::response::Response;
-use tokio::sync::oneshot::Sender;
-
-use super::socket::db::ValidatedAnnounceRequest;
-
-#[derive(Debug)]
-pub struct ChannelAnnounceRequest {
-    pub request: ValidatedAnnounceRequest,
-    pub source_addr: CanonicalSocketAddr,
-    pub response_sender: Sender<Response>,
-}
diff --git a/aquatic_http_private/src/workers/mod.rs b/aquatic_http_private/src/workers/mod.rs
index 978429f..63fc0ec 100644
--- a/aquatic_http_private/src/workers/mod.rs
+++ b/aquatic_http_private/src/workers/mod.rs
@@ -1,3 +1,2 @@
-pub mod common;
 pub mod request;
 pub mod socket;
diff --git a/aquatic_http_private/src/workers/request.rs b/aquatic_http_private/src/workers/request.rs
index 8627706..2fcd8b0 100644
--- a/aquatic_http_private/src/workers/request.rs
+++ b/aquatic_http_private/src/workers/request.rs
@@ -2,10 +2,9 @@ use tokio::sync::mpsc::Receiver;
 
 use aquatic_http_protocol::response::{FailureResponse, Response};
 
+use crate::common::ChannelAnnounceRequest;
 use crate::config::Config;
 
-use super::common::ChannelAnnounceRequest;
-
 pub fn run_request_worker(
     config: Config,
     request_receiver: Receiver<ChannelAnnounceRequest>,