Merge pull request #2631 from input-output-hk/dlachaume/2582/fix-cargo-fmt-ignore-files

fix: formatting issues with `cargo fmt`

Author: dlachaume

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "client-cardano-database-v2"
 description = "Mithril client Cardano database example"
-version = "0.0.10"
+version = "0.0.11"
 authors = ["dev@iohk.io", "mithril-dev@iohk.io"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-cardano-database-v2/Cargo.toml

@@ -4,7 +4,7 @@
 //!
 //! A [FeedbackReceiver] using [indicatif] is used to nicely report the progress to the console.
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use async_trait::async_trait;
 use clap::Parser;
 use futures::Future;

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

@@ -1,7 +1,7 @@
 [package]
 name = "client-cardano-database"
 description = "Mithril client Cardano database example"
-version = "0.1.34"
+version = "0.1.35"
 authors = ["dev@iohk.io", "mithril-dev@iohk.io"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-cardano-database/Cargo.toml

@@ -4,7 +4,7 @@
 //!
 //! A [FeedbackReceiver] using [indicatif] is used to nicely report the progress to the console.
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use async_trait::async_trait;
 use clap::Parser;
 use futures::Future;

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

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client"
-version = "0.12.19"
+version = "0.12.20"
 description = "Mithril client library"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-client/Cargo.toml

@@ -3,15 +3,15 @@ use std::path::{Path, PathBuf};
 use std::pin::Pin;
 use std::sync::Arc;
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use slog::Logger;
 
 use mithril_common::entities::{CompressionAlgorithm, ImmutableFileNumber};
 
 use crate::{
+    MithrilResult,
     file_downloader::{DownloadEvent, FileDownloader, FileDownloaderUri},
     utils::AncillaryVerifier,
-    MithrilResult,
 };
 
 /// The future type for downloading a file
@@ -90,8 +90,7 @@ impl DownloadTask {
         ancillary_verifier: &Arc<AncillaryVerifier>,
         logger: &Logger,
     ) -> MithrilResult<()> {
-        self.download_unpack_file(ancillary_files_temp_dir, logger)
-            .await?;
+        self.download_unpack_file(ancillary_files_temp_dir, logger).await?;
         let validated_manifest = ancillary_verifier.verify(ancillary_files_temp_dir).await?;
         validated_manifest.move_to_final_location(target_dir).await
     }
@@ -205,10 +204,7 @@ mod tests {
                 kind: DownloadKind::Immutable(1),
                 locations_to_try: create_locations_to_download(
                     file_downloader,
-                    [
-                        "http://whatever-1/00001.tar.gz",
-                        "http://whatever-2/00001.tar.gz",
-                    ],
+                    ["http://whatever-1/00001.tar.gz", "http://whatever-2/00001.tar.gz"],
                 ),
                 size_uncompressed: 0,
                 target_dir: target_dir.clone(),
@@ -244,10 +240,7 @@ mod tests {
                 kind: DownloadKind::Immutable(1),
                 locations_to_try: create_locations_to_download(
                     file_downloader,
-                    [
-                        "http://whatever-1/00001.tar.gz",
-                        "http://whatever-2/00001.tar.gz",
-                    ],
+                    ["http://whatever-1/00001.tar.gz", "http://whatever-2/00001.tar.gz"],
                 ),
                 size_uncompressed: 0,
                 target_dir: target_dir.clone(),
@@ -269,11 +262,7 @@ mod tests {
         use super::*;
 
         fn fake_ancillary_verifier() -> AncillaryVerifier {
-            AncillaryVerifier::new(
-                fake_keys::manifest_verification_key()[0]
-                    .try_into()
-                    .unwrap(),
-            )
+            AncillaryVerifier::new(fake_keys::manifest_verification_key()[0].try_into().unwrap())
         }
 
         #[tokio::test]

mithril-client/src/cardano_database_client/download_unpack/download_task.rs

@@ -5,8 +5,8 @@ use anyhow::anyhow;
 
 use mithril_cardano_node_internal_database::{IMMUTABLE_DIR, LEDGER_DIR, VOLATILE_DIR};
 
-use crate::common::ImmutableFileNumber;
 use crate::MithrilResult;
+use crate::common::ImmutableFileNumber;
 
 /// Options for downloading and unpacking a Cardano database
 #[derive(Debug, Copy, Clone)]

mithril-client/src/cardano_database_client/download_unpack/download_unpack_options.rs

@@ -11,17 +11,17 @@ use mithril_common::messages::{
     AncillaryMessagePart, CardanoDatabaseSnapshotMessage, ImmutablesMessagePart,
 };
 
+use crate::MithrilResult;
 use crate::cardano_database_client::ImmutableFileRange;
 use crate::feedback::{FeedbackSender, MithrilEvent, MithrilEventCardanoDatabase};
 use crate::file_downloader::{DownloadEvent, FileDownloader, FileDownloaderUri};
 use crate::utils::{
-    create_bootstrap_node_files, AncillaryVerifier, UnexpectedDownloadedFileVerifier,
-    VecDequeExtensions, ANCILLARIES_NOT_SIGNED_BY_MITHRIL,
+    ANCILLARIES_NOT_SIGNED_BY_MITHRIL, AncillaryVerifier, UnexpectedDownloadedFileVerifier,
+    VecDequeExtensions, create_bootstrap_node_files,
 };
-use crate::MithrilResult;
 
-use super::download_task::{DownloadKind, DownloadTask, LocationToDownload};
 use super::DownloadUnpackOptions;
+use super::download_task::{DownloadKind, DownloadTask, LocationToDownload};
 
 pub struct InternalArtifactDownloader {
     http_file_downloader: Arc<dyn FileDownloader>,
@@ -96,16 +96,17 @@ impl InternalArtifactDownloader {
                 &download_id,
             )?);
         } else {
-            slog::warn!(self.logger, "The fast bootstrap of the Cardano node is not available with the current parameters used in this command: the ledger state will be recomputed from genesis at startup of the Cardano node. Set the include_ancillary entry to true in the DownloadUnpackOptions.");
+            slog::warn!(
+                self.logger,
+                "The fast bootstrap of the Cardano node is not available with the current parameters used in this command: the ledger state will be recomputed from genesis at startup of the Cardano node. Set the include_ancillary entry to true in the DownloadUnpackOptions."
+            );
         }
 
         // Return the result later so unexpected file removal is always run
         let download_result = self
             .batch_download_unpack(tasks, download_unpack_options.max_parallel_downloads)
             .await;
-        expected_files_after_download
-            .remove_unexpected_files()
-            .await?;
+        expected_files_after_download.remove_unexpected_files().await?;
         download_result?;
 
         create_bootstrap_node_files(&self.logger, target_dir, &cardano_database_snapshot.network)?;
@@ -538,11 +539,7 @@ mod tests {
         use super::*;
 
         fn fake_ancillary_verifier() -> AncillaryVerifier {
-            AncillaryVerifier::new(
-                fake_keys::manifest_verification_key()[0]
-                    .try_into()
-                    .unwrap(),
-            )
+            AncillaryVerifier::new(fake_keys::manifest_verification_key()[0].try_into().unwrap())
         }
 
         #[tokio::test]

mithril-client/src/cardano_database_client/download_unpack/internal_downloader.rs

@@ -2,7 +2,7 @@ use std::ops::RangeInclusive;
 
 use anyhow::anyhow;
 
-use mithril_common::{entities::ImmutableFileNumber, StdResult};
+use mithril_common::{StdResult, entities::ImmutableFileNumber};
 
 /// Immutable file range representation
 #[derive(Debug, Eq, PartialEq)]