WIP: adapt call of compute_cardano_database_message to handle the new error

Author: turmelclem

mithril-client-cli/src/commands/cardano_db/download/v1.rs

@@ -185,7 +185,7 @@ impl PreparedCardanoDbV1Download {
         db_dir: &Path,
     ) -> MithrilResult<ProtocolMessage> {
         progress_printer.report_step(step_number, "Computing the cardano db message")?;
-        let message = CardanoDbUtils::wait_spinner(
+        let message = CardanoDbUtils::wait_spinner_v1(
             progress_printer,
             MessageBuilder::new().compute_snapshot_message(certificate, db_dir),
         )

mithril-client-cli/src/commands/cardano_db/verify.rs

@@ -4,10 +4,10 @@ use std::{
     sync::Arc,
 };
 
-use anyhow::Context;
+use anyhow::{Context, anyhow};
 use chrono::Utc;
 use clap::Parser;
-use mithril_client::MithrilResult;
+use mithril_client::{ComputeCardanoDatabaseMessageError, MithrilResult};
 
 use crate::{
     CommandContext,
@@ -122,26 +122,38 @@ impl CardanoDbVerifyCommand {
             db_dir,
             &verified_digests,
         )
-        .await?;
-
-        shared_steps::verify_message_matches_certificate(
-            &context.logger().clone(),
-            4,
-            &progress_printer,
-            &certificate,
-            &message,
-            &cardano_db_message,
-            db_dir,
-        )
-        .await?;
-
-        Self::log_verified_information(
-            db_dir,
-            &cardano_db_message.hash,
-            context.is_json_output_enabled(),
-        )?;
-
-        Ok(())
+        .await;
+
+        //TODO due to wait spinner, we need to cast error to access the inner error's lists, could it be improved to avoid downcasting?
+        match message {
+            Err(e) => match e.downcast_ref::<ComputeCardanoDatabaseMessageError>() {
+                Some(ComputeCardanoDatabaseMessageError::ImmutableFilesVerification(lists)) => {
+                    // let missing_files = lists.missing;
+                    Ok(())
+                }
+                _ => Err(anyhow!(e)),
+            },
+            Ok(message) => {
+                shared_steps::verify_message_matches_certificate(
+                    &context.logger().clone(),
+                    4,
+                    &progress_printer,
+                    &certificate,
+                    &message,
+                    &cardano_db_message,
+                    db_dir,
+                )
+                .await?;
+
+                Self::log_verified_information(
+                    db_dir,
+                    &cardano_db_message.hash,
+                    context.is_json_output_enabled(),
+                )?;
+
+                Ok(())
+            }
+        }
     }
 
     fn log_verified_information(

mithril-client-cli/src/utils/cardano_db.rs

@@ -4,7 +4,7 @@ use indicatif::{MultiProgress, ProgressBar};
 use std::time::Duration;
 
 use super::CardanoDbDownloadCheckerError;
-use mithril_client::{MithrilError, MithrilResult};
+use mithril_client::{ComputeCardanoDatabaseMessageError, MithrilError, MithrilResult};
 
 /// Utility functions for to the CardanoDb commands
 pub struct CardanoDbUtils;
@@ -22,7 +22,7 @@ impl CardanoDbUtils {
     }
 
     /// Display a spinner while waiting for the result of a future
-    pub async fn wait_spinner<T>(
+    pub async fn wait_spinner_v1<T>(
         progress_bar: &MultiProgress,
         future: impl Future<Output = MithrilResult<T>>,
     ) -> MithrilResult<T> {
@@ -40,6 +40,28 @@ impl CardanoDbUtils {
         }
     }
 
+    /// Display a spinner while waiting for the result of a future
+    pub async fn wait_spinner<T>(
+        progress_bar: &MultiProgress,
+        future: impl Future<Output = Result<T, ComputeCardanoDatabaseMessageError>>,
+    ) -> MithrilResult<T> {
+        let pb = progress_bar.add(ProgressBar::new_spinner());
+        let spinner = async move {
+            loop {
+                pb.tick();
+                tokio::time::sleep(Duration::from_millis(50)).await;
+            }
+        };
+
+        tokio::select! {
+            _ = spinner => Err(anyhow!("timeout")),
+            res = future => {match res {
+                Ok(value) => Ok(value),
+                Err(e) => Err(anyhow!(e)),
+            }},
+        }
+    }
+
     pub fn format_bytes_to_gigabytes(bytes: u64) -> String {
         let size_in_giga = bytes as f64 / (1024.0 * 1024.0 * 1024.0);