refactor(aggregator-client): rename query/certificate mod to get

Since there will be arround ~20 requests maximum, making a module by
subject will result on a lots of modules with one or two files, not that
helpful.
+ rename `CertificateDetailsQuery` to `GetCertificateQuery` to have
an uniform convention: `{Verb}{Subject}Query`.

Author: Alenar

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

@@ -9,12 +9,12 @@ use crate::AggregatorClientResult;
 use crate::error::AggregatorClientError;
 use crate::query::{AggregatorQuery, QueryContext, QueryMethod};
 
-/// Get the details of a certificate
-pub struct CertificateDetailsQuery {
+/// Query to get the details of a certificate
+pub struct GetCertificateQuery {
     hash: String,
 }
 
-impl CertificateDetailsQuery {
+impl GetCertificateQuery {
     /// Instantiate a query to get a certificate by hash
     pub fn by_hash<H: Into<String>>(hash: H) -> Self {
         Self { hash: hash.into() }
@@ -30,7 +30,7 @@ impl CertificateDetailsQuery {
 
 #[cfg_attr(target_family = "wasm", async_trait(?Send))]
 #[cfg_attr(not(target_family = "wasm"), async_trait)]
-impl AggregatorQuery for CertificateDetailsQuery {
+impl AggregatorQuery for GetCertificateQuery {
     type Response = Option<CertificateMessage>;
     type Body = ();
 
@@ -65,7 +65,7 @@ mod tests {
 
     use mithril_common::test::double::Dummy;
 
-    use crate::test::setup_server_and_client;
+    use crate::test::{assert_error_matches, setup_server_and_client};
 
     use super::*;
 
@@ -79,7 +79,7 @@ mod tests {
         });
 
         let fetched_message = client
-            .send(CertificateDetailsQuery::by_hash(&expected_message.hash))
+            .send(GetCertificateQuery::by_hash(&expected_message.hash))
             .await
             .unwrap();
 
@@ -94,10 +94,7 @@ mod tests {
             then.status(404);
         });
 
-        let fetched_message = client
-            .send(CertificateDetailsQuery::by_hash("whatever"))
-            .await
-            .unwrap();
+        let fetched_message = client.send(GetCertificateQuery::by_hash("whatever")).await.unwrap();
 
         assert_eq!(None, fetched_message);
     }
@@ -110,14 +107,12 @@ mod tests {
             then.status(500).body("an error occurred");
         });
 
-        match client
-            .send(CertificateDetailsQuery::by_hash("whatever"))
+        let error = client
+            .send(GetCertificateQuery::by_hash("whatever"))
             .await
-            .unwrap_err()
-        {
-            AggregatorClientError::RemoteServerTechnical(_) => (),
-            e => panic!("Expected Aggregator::RemoteServerTechnical error, got '{e:?}'."),
-        };
+            .unwrap_err();
+
+        assert_error_matches!(error, AggregatorClientError::RemoteServerTechnical(_));
     }
 
     #[tokio::test]
@@ -129,7 +124,7 @@ mod tests {
             then.status(200).body(json!(genesis_message).to_string());
         });
 
-        let fetched = client.send(CertificateDetailsQuery::latest_genesis()).await.unwrap();
+        let fetched = client.send(GetCertificateQuery::latest_genesis()).await.unwrap();
 
         assert_eq!(Some(genesis_message), fetched);
     }
@@ -142,7 +137,7 @@ mod tests {
             then.status(404);
         });
 
-        let fetched = client.send(CertificateDetailsQuery::latest_genesis()).await.unwrap();
+        let fetched = client.send(GetCertificateQuery::latest_genesis()).await.unwrap();
 
         assert_eq!(None, fetched);
     }
@@ -155,14 +150,8 @@ mod tests {
             then.status(500).body("an error occurred");
         });
 
-        let error = client
-            .send(CertificateDetailsQuery::latest_genesis())
-            .await
-            .unwrap_err();
+        let error = client.send(GetCertificateQuery::latest_genesis()).await.unwrap_err();
 
-        assert!(
-            matches!(error, AggregatorClientError::RemoteServerTechnical(_)),
-            "Expected Aggregator::RemoteServerTechnical error, got {error:?}"
-        );
+        assert_error_matches!(error, AggregatorClientError::RemoteServerTechnical(_));
     }
 }

internal/mithril-aggregator-client/src/query/get/get_aggregator_features.rs

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

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

@@ -4,7 +4,7 @@
 //! - Certificate: Get by hash, get latest genesis certificate
 //!
 mod api;
-mod certificate;
+mod get;
 
 pub(crate) use api::*;
-pub use certificate::*;
+pub use get::*;

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

@@ -15,3 +15,17 @@ pub(crate) fn setup_server_and_client() -> (MockServer, AggregatorClient) {
 
     (server, client)
 }
+
+#[cfg(test)]
+macro_rules! assert_error_matches {
+    ($error:expr, $error_type:pat) => {
+        assert!(
+            matches!($error, $error_type),
+            "Expected {} error, got '{:?}'.",
+            stringify!($error_type),
+            $error
+        );
+    };
+}
+#[cfg(test)]
+pub(crate) use assert_error_matches;