refactor(aggregator-client): move query related types to query module

and move certificate_details query to `query::certificate::get_certificate_details`

Author: Alenar

internal/mithril-aggregator-client/src/client.rs

@@ -1,49 +1,11 @@
 use anyhow::{Context, anyhow};
-use reqwest::{Response, Url};
+use reqwest::Url;
 
-use serde::de::DeserializeOwned;
 use slog::Logger;
 
 use crate::AggregatorClientResult;
 use crate::error::AggregatorClientError;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum QueryMethod {
-    Get,
-    Post,
-}
-
-// Todo: wasm compatibility
-#[async_trait::async_trait]
-pub(crate) trait AggregatorQuery {
-    type Response: DeserializeOwned;
-    type Body: serde::Serialize + Sized;
-
-    fn method() -> QueryMethod;
-
-    fn route(&self) -> String;
-
-    fn body(&self) -> Option<Self::Body> {
-        None
-    }
-
-    async fn handle_response(
-        &self,
-        context: QueryContext,
-    ) -> AggregatorClientResult<Self::Response>;
-}
-
-// internal to the crate
-pub(crate) struct QueryContext {
-    pub(crate) response: Response,
-    pub(crate) logger: Logger,
-}
-
-impl QueryContext {
-    pub(crate) async fn unhandled_status_code(self) -> AggregatorClientError {
-        AggregatorClientError::from_response(self.response).await
-    }
-}
+use crate::query::{AggregatorQuery, QueryContext, QueryMethod};
 
 pub struct AggregatorClient {
     aggregator_endpoint: Url,

internal/mithril-aggregator-client/src/query/api.rs

@@ -0,0 +1,43 @@
+use reqwest::Response;
+use serde::de::DeserializeOwned;
+use slog::Logger;
+
+use crate::AggregatorClientResult;
+use crate::error::AggregatorClientError;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum QueryMethod {
+    Get,
+    Post,
+}
+
+// Todo: wasm compatibility
+#[async_trait::async_trait]
+pub trait AggregatorQuery {
+    type Response: DeserializeOwned;
+    type Body: serde::Serialize + Sized;
+
+    fn method() -> QueryMethod;
+
+    fn route(&self) -> String;
+
+    fn body(&self) -> Option<Self::Body> {
+        None
+    }
+
+    async fn handle_response(
+        &self,
+        context: QueryContext,
+    ) -> AggregatorClientResult<Self::Response>;
+}
+
+pub struct QueryContext {
+    pub(crate) response: Response,
+    pub(crate) logger: Logger,
+}
+
+impl QueryContext {
+    pub async fn unhandled_status_code(self) -> AggregatorClientError {
+        AggregatorClientError::from_response(self.response).await
+    }
+}

internal/mithril-aggregator-client/src/query/certificate_details.rs renamed to internal/mithril-aggregator-client/src/query/certificate/get_certificate_details.rs

@@ -5,8 +5,8 @@ use slog::debug;
 use mithril_common::messages::CertificateMessage;
 
 use crate::AggregatorClientResult;
-use crate::client::{AggregatorQuery, QueryContext, QueryMethod};
 use crate::error::AggregatorClientError;
+use crate::query::{AggregatorQuery, QueryContext, QueryMethod};
 
 pub struct CertificateDetailsQuery {
     hash: String,

internal/mithril-aggregator-client/src/query/certificate/mod.rs

@@ -0,0 +1,3 @@
+mod get_certificate_details;
+
+pub use get_certificate_details::*;

internal/mithril-aggregator-client/src/query/mod.rs

@@ -1,3 +1,5 @@
-mod certificate_details;
+mod api;
+mod certificate;
 
-pub use certificate_details::*;
+pub(crate) use api::*;
+pub use certificate::*;