feature(client-lib, examples): adapt examples with the new compute_cardano_database_message function

Author: turmelclem

examples/client-cardano-database-v2/src/main.rs

@@ -17,7 +17,7 @@ use std::time::Duration;
 use tokio::sync::RwLock;
 
 use mithril_client::feedback::{FeedbackReceiver, MithrilEvent, MithrilEventCardanoDatabase};
-use mithril_client::{ClientBuilder, MessageBuilder, MithrilResult};
+use mithril_client::{ClientBuilder, MessageBuilder, MithrilError, MithrilResult};
 
 #[derive(Parser, Debug)]
 #[command(version)]
@@ -104,21 +104,6 @@ async fn main() -> MithrilResult<()> {
         .download_and_verify_digests(&certificate, &cardano_database_snapshot)
         .await?;
 
-    println!("Computing Cardano database Merkle proof...",);
-    let merkle_proof = client
-        .cardano_database_v2()
-        .compute_merkle_proof(
-            &certificate,
-            cardano_database_snapshot.beacon.immutable_file_number,
-            &immutable_file_range,
-            &unpacked_dir,
-            &verified_digest,
-        )
-        .await?;
-    merkle_proof
-        .verify()
-        .with_context(|| "Merkle proof verification failed")?;
-
     println!("Sending usage statistics to the aggregator...");
     let full_restoration = immutable_file_range == ImmutableFileRange::Full;
     let include_ancillary = download_unpack_options.include_ancillary;
@@ -140,9 +125,17 @@ async fn main() -> MithrilResult<()> {
         "Computing Cardano database snapshot '{}' message...",
         cardano_database_snapshot.hash
     );
+    let allow_missing_immutables_files = false;
     let message = wait_spinner(
         &progress_bar,
-        MessageBuilder::new().compute_cardano_database_message(&certificate, merkle_proof.root()),
+        MessageBuilder::new().compute_cardano_database_message(
+            &certificate,
+            &cardano_database_snapshot,
+            &immutable_file_range,
+            allow_missing_immutables_files,
+            &unpacked_dir,
+            &verified_digest,
+        ),
     )
     .await?;
 
@@ -268,10 +261,13 @@ fn get_temp_dir() -> MithrilResult<PathBuf> {
     Ok(dir)
 }
 
-async fn wait_spinner<T>(
+pub async fn wait_spinner<T, E>(
     progress_bar: &MultiProgress,
-    future: impl Future<Output = MithrilResult<T>>,
-) -> MithrilResult<T> {
+    future: impl Future<Output = Result<T, E>>,
+) -> MithrilResult<T>
+where
+    MithrilError: From<E>,
+{
     let pb = progress_bar.add(ProgressBar::new_spinner());
     let spinner = async move {
         loop {
@@ -282,6 +278,6 @@ async fn wait_spinner<T>(
 
     tokio::select! {
         _ = spinner => Err(anyhow!("timeout")),
-        res = future => res,
+        res = future => res.map_err(Into::into),
     }
 }

mithril-client/src/cardano_database_client/mod.rs

@@ -4,7 +4,6 @@
 //!  - [get][CardanoDatabaseClient::get]: get a Cardano database data from its hash
 //!  - [list][CardanoDatabaseClient::list]: get the list of available Cardano database
 //!  - [download_unpack][CardanoDatabaseClient::download_unpack]: download and unpack a Cardano database snapshot for a given immutable files range
-//!  - [compute_merkle_proof][CardanoDatabaseClient::compute_merkle_proof]: compute a Merkle proof for a given Cardano database snapshot and a given immutable files range
 //!
 //! # Get a Cardano database
 //!
@@ -88,7 +87,7 @@
 //! ```no_run
 //! # #[cfg(feature = "fs")]
 //! # async fn run() -> mithril_client::MithrilResult<()> {
-//! use mithril_client::{ClientBuilder, cardano_database_client::{ImmutableFileRange, DownloadUnpackOptions}};
+//! use mithril_client::{ClientBuilder, MessageBuilder, cardano_database_client::{ImmutableFileRange, DownloadUnpackOptions}};
 //! use std::path::Path;
 //!
 //! let client = ClientBuilder::aggregator("YOUR_AGGREGATOR_ENDPOINT", "YOUR_GENESIS_VERIFICATION_KEY").build()?;
@@ -120,10 +119,15 @@
 //!         &cardano_database_snapshot)
 //!     .await?;
 //!
-//! let merkle_proof = client
-//!     .cardano_database_v2()
-//!     .compute_merkle_proof(&certificate, cardano_database_snapshot.beacon.immutable_file_number, &immutable_file_range, &target_directory, &verified_digests)
-//!     .await?;
+//! let allow_missing_immutables_files = false;
+//! let message = MessageBuilder::new().compute_cardano_database_message(
+//!         &certificate,
+//!         &cardano_database_snapshot,
+//!         &immutable_file_range,
+//!         allow_missing_immutables_files,
+//!         &target_directory,
+//!         &verified_digests,
+//!     ).await?;
 //! #
 //! #    Ok(())
 //! # }