Merge pull request #1543 from input-output-hk/ensemble/1524/improve-h…

…ttp-tests

Improve aggregator HTTP server tests

internal/mithril-persistence/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-persistence"
-version = "0.1.1"
+version = "0.1.2"
 description = "Common types, interfaces, and utilities to persist data for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }

internal/mithril-persistence/src/store/adapter/dumb_adapter.rs

@@ -1,10 +1,12 @@
 use super::{AdapterError, StoreAdapter};
+use anyhow::anyhow;
 use async_trait::async_trait;
 
 /// A [StoreAdapter] that store one fixed data record, for testing purpose.
 pub struct DumbStoreAdapter<K, R> {
     last_key: Option<K>,
     last_value: Option<R>,
+    error: Option<String>,
 }
 
 impl<K, R> DumbStoreAdapter<K, R> {
@@ -13,6 +15,15 @@ impl<K, R> DumbStoreAdapter<K, R> {
         Self {
             last_key: None,
             last_value: None,
+            error: None,
+        }
+    }
+
+    /// DumbStoreAdapter factory that returns error when 'get_record' is called.
+    pub fn new_failing_adapter(error: &str) -> Self {
+        Self {
+            error: Some(error.to_string()),
+            ..Self::new()
         }
     }
 }
@@ -47,10 +58,15 @@ where
     }
 
     async fn get_record(&self, key: &Self::Key) -> Result<Option<Self::Record>, AdapterError> {
-        if self.record_exists(key).await? {
-            Ok(self.last_value.as_ref().cloned())
-        } else {
-            Ok(None)
+        match &self.error {
+            Some(error) => Err(AdapterError::GeneralError(anyhow!(error.clone()))),
+            None => {
+                if self.record_exists(key).await? {
+                    Ok(self.last_value.as_ref().cloned())
+                } else {
+                    Ok(None)
+                }
+            }
         }
     }
 
@@ -208,4 +224,13 @@ mod tests {
 
         assert_eq!(0, records.count());
     }
+
+    #[tokio::test]
+    async fn test_return_error_calling_get_record() {
+        let adapter: DumbStoreAdapter<String, String> =
+            DumbStoreAdapter::new_failing_adapter("error");
+        let result = adapter.get_record(&"key".to_string()).await;
+
+        assert!(result.is_err());
+    }
 }

mithril-aggregator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.4.43"
+version = "0.4.44"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/src/http_server/routes/artifact_routes/cardano_transaction.rs

@@ -102,7 +102,10 @@ pub mod tests {
     };
     use mithril_persistence::sqlite::HydrationError;
     use serde_json::Value::Null;
-    use warp::{http::Method, test::request};
+    use warp::{
+        http::{Method, StatusCode},
+        test::request,
+    };
 
     use super::*;
 
@@ -150,7 +153,9 @@ pub mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::OK,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
@@ -179,7 +184,9 @@ pub mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::INTERNAL_SERVER_ERROR,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
@@ -216,11 +223,13 @@ pub mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::OK,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
-    async fn test_cardano_transaction_ok_norecord() {
+    async fn test_cardano_transaction_return_404_not_found_when_no_record() {
         let mut mock_http_message_service = MockMessageService::new();
         mock_http_message_service
             .expect_get_cardano_transaction_message()
@@ -245,7 +254,9 @@ pub mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::NOT_FOUND,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
@@ -274,6 +285,8 @@ pub mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::INTERNAL_SERVER_ERROR,
+        )
+        .unwrap();
     }
 }

mithril-aggregator/src/http_server/routes/artifact_routes/mithril_stake_distribution.rs

@@ -103,7 +103,10 @@ pub mod tests {
     };
     use mithril_persistence::sqlite::HydrationError;
     use serde_json::Value::Null;
-    use warp::{http::Method, test::request};
+    use warp::{
+        http::{Method, StatusCode},
+        test::request,
+    };
 
     use super::*;
 
@@ -151,7 +154,9 @@ pub mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::OK,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
@@ -180,7 +185,9 @@ pub mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::INTERNAL_SERVER_ERROR,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
@@ -217,11 +224,13 @@ pub mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::OK,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
-    async fn test_mithril_stake_distribution_ok_norecord() {
+    async fn test_mithril_stake_distribution_returns_404_no_found_when_no_record() {
         let mut mock_http_message_service = MockMessageService::new();
         mock_http_message_service
             .expect_get_mithril_stake_distribution_message()
@@ -246,7 +255,9 @@ pub mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::NOT_FOUND,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
@@ -275,6 +286,8 @@ pub mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::INTERNAL_SERVER_ERROR,
+        )
+        .unwrap();
     }
 }

mithril-aggregator/src/http_server/routes/artifact_routes/snapshot.rs

@@ -234,7 +234,10 @@ mod tests {
     };
     use mithril_persistence::sqlite::HydrationError;
     use serde_json::Value::Null;
-    use warp::{http::Method, test::request};
+    use warp::{
+        http::{Method, StatusCode},
+        test::request,
+    };
 
     use super::*;
 
@@ -282,7 +285,9 @@ mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::OK,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
@@ -311,7 +316,9 @@ mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::INTERNAL_SERVER_ERROR,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
@@ -348,11 +355,13 @@ mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::OK,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
-    async fn test_snapshot_digest_get_ok_nosnapshot() {
+    async fn test_snapshot_digest_returns_404_not_found_when_no_snapshot() {
         let mut mock_http_message_service = MockMessageService::new();
         mock_http_message_service
             .expect_get_snapshot_message()
@@ -377,7 +386,9 @@ mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::NOT_FOUND,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
@@ -406,11 +417,13 @@ mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::INTERNAL_SERVER_ERROR,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
-    async fn test_snapshot_download_get_ok() {
+    async fn test_snapshot_local_download_returns_302_found_when_the_snapshot_exists() {
         let signed_entity = create_signed_entities(
             SignedEntityType::CardanoImmutableFilesFull(Beacon::default()),
             fake_data::snapshots(1),
@@ -435,18 +448,19 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::verify_conformity(
-            APISpec::get_all_spec_files(),
-            method,
-            path,
-            "application/gzip",
-            &Null,
-            &response,
+        assert_eq!(response.status(), StatusCode::FOUND);
+        let location = std::str::from_utf8(response.headers()["location"].as_bytes())
+            .unwrap()
+            .to_string();
+        assert!(
+            location.contains(&format!("/{SERVER_BASE_PATH}/snapshot_download/testnet")),
+            "Expected value '/{SERVER_BASE_PATH}/snapshot_download/testnet' not found in {}",
+            location
         );
     }
 
     #[tokio::test]
-    async fn test_snapshot_download_get_ok_nosnapshot() {
+    async fn test_snapshot_download_returns_404_not_found_when_no_snapshot() {
         let mut mock_signed_entity_service = MockSignedEntityService::new();
         mock_signed_entity_service
             .expect_get_signed_snapshot_by_id()
@@ -471,7 +485,9 @@ mod tests {
             "application/gzip",
             &Null,
             &response,
-        );
+            &StatusCode::NOT_FOUND,
+        )
+        .unwrap();
     }
 
     #[tokio::test]
@@ -500,6 +516,8 @@ mod tests {
             "application/json",
             &Null,
             &response,
-        );
+            &StatusCode::INTERNAL_SERVER_ERROR,
+        )
+        .unwrap();
     }
 }