fix: format each file individually as cargo fmt skips files wrapped in macros

Author: dlachaume

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

@@ -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_unpack_options.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/internal_downloader.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/immutable_file_range.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)]

mithril-client/src/cardano_database_client/proving.rs

@@ -5,7 +5,7 @@ use std::{
     sync::Arc,
 };
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 
 use mithril_cardano_node_internal_database::{
     digesters::{CardanoImmutableDigester, ImmutableDigester},
@@ -21,10 +21,10 @@ use mithril_common::{
 };
 
 use crate::{
+    MithrilResult,
     feedback::MithrilEvent,
     file_downloader::{DownloadEvent, FileDownloader, FileDownloaderUri},
     utils::{create_directory_if_not_exists, delete_directory, read_files_in_directory},
-    MithrilResult,
 };
 
 use super::immutable_file_range::ImmutableFileRange;
@@ -195,10 +195,10 @@ mod tests {
         use std::ops::RangeInclusive;
 
         use mithril_cardano_node_internal_database::{
-            digesters::ComputedImmutablesDigests, IMMUTABLE_DIR,
+            IMMUTABLE_DIR, digesters::ComputedImmutablesDigests,
         };
         use mithril_common::{
-            entities::ImmutableFileNumber, messages::DigestsMessagePart, StdResult,
+            StdResult, entities::ImmutableFileNumber, messages::DigestsMessagePart,
         };
 
         use super::*;
@@ -252,9 +252,7 @@ mod tests {
             {
                 fs::remove_file(
                     database_dir.join(
-                        database_dir
-                            .join(IMMUTABLE_DIR)
-                            .join(immutable_file.filename.clone()),
+                        database_dir.join(IMMUTABLE_DIR).join(immutable_file.filename.clone()),
                     ),
                 )
                 .unwrap();

mithril-client/src/file_downloader/http.rs

@@ -3,24 +3,24 @@ use std::{
     path::Path,
 };
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use async_trait::async_trait;
 use flate2::read::GzDecoder;
 use flume::{Receiver, Sender};
 use futures::StreamExt;
 use reqwest::{Response, StatusCode, Url};
-use slog::{debug, Logger};
+use slog::{Logger, debug};
 use tar::Archive;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 
-use mithril_common::{logging::LoggerExtensions, StdResult};
+use mithril_common::{StdResult, logging::LoggerExtensions};
 
 use crate::common::CompressionAlgorithm;
 use crate::feedback::FeedbackSender;
 use crate::utils::StreamReader;
 
-use super::{interface::DownloadEvent, FileDownloader, FileDownloaderUri};
+use super::{FileDownloader, FileDownloaderUri, interface::DownloadEvent};
 
 /// A file downloader that only handles download through HTTP.
 pub struct HttpFileDownloader {
@@ -94,9 +94,7 @@ impl HttpFileDownloader {
             }
             buffer.truncate(bytes_read);
             sender.send_async(buffer).await.with_context(|| {
-                format!(
-                    "Local file read: could not write {bytes_read} bytes to stream."
-                )
+                format!("Local file read: could not write {bytes_read} bytes to stream.")
             })?;
             downloaded_bytes += bytes_read as u64;
             let event = download_event_type.build_download_progress_event(downloaded_bytes, size);

mithril-client/src/file_downloader/interface.rs

@@ -4,10 +4,10 @@ use anyhow::anyhow;
 use async_trait::async_trait;
 
 use mithril_common::{
+    StdError, StdResult,
     entities::{
         AncillaryLocation, CompressionAlgorithm, DigestLocation, FileUri, ImmutableFileNumber,
     },
-    StdError, StdResult,
 };
 
 use crate::feedback::{MithrilEvent, MithrilEventCardanoDatabase};

mithril-client/src/file_downloader/mock_builder.rs

@@ -8,9 +8,9 @@ use sha2::{Digest, Sha256};
 
 use mithril_cardano_node_internal_database::entities::AncillaryFilesManifest;
 use mithril_common::{
+    StdResult,
     crypto_helper::ManifestSigner,
     entities::{CompressionAlgorithm, FileUri},
-    StdResult,
 };
 
 use super::{DownloadEvent, FileDownloaderUri, MockFileDownloader};
@@ -91,9 +91,7 @@ impl MockFileDownloaderBuilder {
     ) -> Self {
         self.with_returning(Box::new(move |_, _, target_dir: &Path, _, _| {
             for filename in [
-                fake_ancillary_file_builder
-                    .files_in_manifest_to_create
-                    .as_slice(),
+                fake_ancillary_file_builder.files_in_manifest_to_create.as_slice(),
                 fake_ancillary_file_builder
                     .files_not_in_manifest_to_create
                     .as_ref()
@@ -178,10 +176,7 @@ impl MockFileDownloaderBuilder {
                 .unwrap_or(true)
         });
         let predicate_target_dir = predicate::function(move |u| {
-            self.param_target_dir
-                .as_ref()
-                .map(|x| x == u)
-                .unwrap_or(true)
+            self.param_target_dir.as_ref().map(|x| x == u).unwrap_or(true)
         });
         let predicate_compression_algorithm = predicate::function(move |u| {
             self.param_compression_algorithm
@@ -272,9 +267,7 @@ mod tests {
         verifier
             .verify(
                 &ancillary_manifest.compute_hash(),
-                &ancillary_manifest
-                    .signature()
-                    .expect("Manifest should be signed"),
+                &ancillary_manifest.signature().expect("Manifest should be signed"),
             )
             .expect("Signed manifest should have a valid signature");
 

mithril-client/src/file_downloader/retry.rs

@@ -1,7 +1,7 @@
 use std::{path::Path, sync::Arc, time::Duration};
 
 use async_trait::async_trait;
-use mithril_common::{entities::CompressionAlgorithm, StdResult};
+use mithril_common::{StdResult, entities::CompressionAlgorithm};
 
 use super::{DownloadEvent, FileDownloader, FileDownloaderUri};
 

mithril-client/src/utils/ancillary_verifier.rs

@@ -175,9 +175,7 @@ mod tests {
             let temp_dir = temp_dir_create!();
 
             let ancillary_verifier = AncillaryVerifier::new(
-                fake_keys::manifest_verification_key()[0]
-                    .try_into()
-                    .unwrap(),
+                fake_keys::manifest_verification_key()[0].try_into().unwrap(),
             );
 
             let err = ancillary_verifier.verify(&temp_dir).await.unwrap_err();
@@ -196,9 +194,7 @@ mod tests {
             write!(&manifest_file, "invalid json").unwrap();
 
             let ancillary_verifier = AncillaryVerifier::new(
-                fake_keys::manifest_verification_key()[0]
-                    .try_into()
-                    .unwrap(),
+                fake_keys::manifest_verification_key()[0].try_into().unwrap(),
             );
 
             let err = ancillary_verifier.verify(&temp_dir).await.unwrap_err();
@@ -261,9 +257,7 @@ mod tests {
                 signable_manifest: SignableManifest {
                     // Note: This is a valid signature, but for different data
                     signature: Some(
-                        fake_keys::signable_manifest_signature()[0]
-                            .try_into()
-                            .unwrap(),
+                        fake_keys::signable_manifest_signature()[0].try_into().unwrap(),
                     ),
                     ..valid_manifest(&temp_dir, &signer).signable_manifest
                 },
@@ -326,10 +320,7 @@ mod tests {
                 ancillary_files: vec![file_in_root_dir.clone(), file_in_subdir.clone()],
             };
 
-            validated_manifest
-                .move_to_final_location(&target_dir)
-                .await
-                .unwrap();
+            validated_manifest.move_to_final_location(&target_dir).await.unwrap();
 
             assert_dir_eq!(
                 &source_dir,
@@ -363,10 +354,7 @@ mod tests {
             };
 
             assert!(target_dir.join(&existing_file_path).exists());
-            validated_manifest
-                .move_to_final_location(&target_dir)
-                .await
-                .unwrap();
+            validated_manifest.move_to_final_location(&target_dir).await.unwrap();
 
             assert!(!source_dir.join(&existing_file_path).exists());
             let final_content =