refactor(client-cli): realign client CLI download and verify command with new API call

Author: Clément Turmel

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

@@ -65,7 +65,7 @@ impl PreparedCardanoDbV2Download {
         } else {
             ProgressOutputType::Tty
         };
-        let progress_printer = ProgressPrinter::new(progress_output_type, 6);
+        let progress_printer = ProgressPrinter::new(progress_output_type, 7);
         let client = client_builder(context.config_parameters())?
             .add_feedback_receiver(Arc::new(IndicatifFeedbackReceiver::new(
                 progress_output_type,
@@ -147,19 +147,30 @@ impl PreparedCardanoDbV2Download {
             immutable_file_range: restoration_options.immutable_file_range,
             allow_missing: false,
         };
-        let message = shared_steps::compute_cardano_db_snapshot_message(
+
+        let merkle_proof = shared_steps::verify_cardano_database(
             5,
             &progress_printer,
+            &client,
             &certificate,
             &cardano_db_message,
             &options,
             &verified_digests,
         )
+        .await
+        .with_context(|| format!("Can not verify cardano database for hash: '{}'", self.hash))?;
+
+        let message = shared_steps::compute_cardano_db_snapshot_message(
+            6,
+            &progress_printer,
+            &certificate,
+            &merkle_proof,
+        )
         .await?;
 
         shared_steps::verify_message_matches_certificate(
             context.logger(),
-            6,
+            7,
             &progress_printer,
             &certificate,
             &message,

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

@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};
 use mithril_client::{
     CardanoDatabaseSnapshot, Client, MessageBuilder, MithrilCertificate, MithrilResult,
     cardano_database_client::{ImmutableFileRange, VerifiedDigests},
-    common::{ImmutableFileNumber, ProtocolMessage},
+    common::{ImmutableFileNumber, MKProof, ProtocolMessage},
 };
 
 use crate::utils::{CardanoDbUtils, ProgressPrinter};
@@ -69,19 +69,19 @@ pub async fn download_and_verify_digests(
     Ok(verified_digests)
 }
 
-/// Computes the Cardano database snapshot message using the provided certificate and Merkle proof.
-pub async fn compute_cardano_db_snapshot_message(
+pub async fn verify_cardano_database(
     step_number: u16,
     progress_printer: &ProgressPrinter,
+    client: &Client,
     certificate: &MithrilCertificate,
     cardano_database_snapshot: &CardanoDatabaseSnapshot,
     options: &ComputeCardanoDatabaseMessageOptions,
     verified_digest: &VerifiedDigests,
-) -> MithrilResult<ProtocolMessage> {
-    progress_printer.report_step(step_number, "Computing the cardano db snapshot message")?;
-    let message = CardanoDbUtils::wait_spinner(
+) -> MithrilResult<MKProof> {
+    progress_printer.report_step(step_number, "Verifying the cardano database")?;
+    let merkle_proof = CardanoDbUtils::wait_spinner(
         progress_printer,
-        MessageBuilder::new().compute_cardano_database_message(
+        client.cardano_database_v2().verify_cardano_database(
             certificate,
             cardano_database_snapshot,
             &options.immutable_file_range,
@@ -91,6 +91,24 @@ pub async fn compute_cardano_db_snapshot_message(
         ),
     )
     .await
+    .with_context(|| "Can not verify the cardano database")?;
+
+    Ok(merkle_proof)
+}
+
+/// Computes the Cardano database snapshot message using the provided certificate and Merkle proof.
+pub async fn compute_cardano_db_snapshot_message(
+    step_number: u16,
+    progress_printer: &ProgressPrinter,
+    certificate: &MithrilCertificate,
+    merkle_proof: &MKProof,
+) -> MithrilResult<ProtocolMessage> {
+    progress_printer.report_step(step_number, "Computing the cardano db snapshot message")?;
+    let message = CardanoDbUtils::wait_spinner(
+        progress_printer,
+        MessageBuilder::new().compute_cardano_database_message(certificate, merkle_proof),
+    )
+    .await
     .with_context(|| "Can not compute the cardano db snapshot message")?;
 
     Ok(message)

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

@@ -8,8 +8,10 @@ use anyhow::Context;
 use chrono::{DateTime, Utc};
 use clap::Parser;
 use mithril_client::{
-    CardanoDatabaseSnapshot, ComputeCardanoDatabaseMessageError, ImmutableVerificationResult,
-    MithrilResult, cardano_database_client::ImmutableFileRange, common::ImmutableFileNumber,
+    CardanoDatabaseSnapshot, MithrilResult,
+    cardano_database_client::ImmutableFileRange,
+    cardano_database_client::{CardanoDatabaseVerificationError, ImmutableVerificationResult},
+    common::ImmutableFileNumber,
 };
 
 use crate::{
@@ -85,7 +87,7 @@ impl CardanoDbVerifyCommand {
         } else {
             ProgressOutputType::Tty
         };
-        let progress_printer = ProgressPrinter::new(progress_output_type, 4);
+        let progress_printer = ProgressPrinter::new(progress_output_type, 5);
         let client = client_builder(context.config_parameters())?
             .add_feedback_receiver(Arc::new(IndicatifFeedbackReceiver::new(
                 progress_output_type,
@@ -146,19 +148,21 @@ impl CardanoDbVerifyCommand {
             immutable_file_range,
             allow_missing: self.allow_missing,
         };
-        let message = shared_steps::compute_cardano_db_snapshot_message(
+
+        let merkle_proof = shared_steps::verify_cardano_database(
             3,
             &progress_printer,
+            &client,
             &certificate,
             &cardano_db_message,
             &options,
             &verified_digests,
         )
         .await;
 
-        match message {
-            Err(e) => match e.downcast_ref::<ComputeCardanoDatabaseMessageError>() {
-                Some(ComputeCardanoDatabaseMessageError::ImmutableFilesVerification(lists)) => {
+        match merkle_proof {
+            Err(e) => match e.downcast_ref::<CardanoDatabaseVerificationError>() {
+                Some(CardanoDatabaseVerificationError::ImmutableFilesVerification(lists)) => {
                     Self::print_immutables_verification_error(
                         lists,
                         context.is_json_output_enabled(),
@@ -167,10 +171,18 @@ impl CardanoDbVerifyCommand {
                 }
                 _ => Err(e),
             },
-            Ok(message) => {
+            Ok(merkle_proof) => {
+                let message = shared_steps::compute_cardano_db_snapshot_message(
+                    4,
+                    &progress_printer,
+                    &certificate,
+                    &merkle_proof,
+                )
+                .await?;
+
                 shared_steps::verify_message_matches_certificate(
                     &context.logger().clone(),
-                    4,
+                    5,
                     &progress_printer,
                     &certificate,
                     &message,