chore: run cargo fmt

Author: dlachaume

demo/protocol-demo/src/types.rs

@@ -3,7 +3,7 @@ use mithril_stm::{
     StmVerificationKeyPoP,
 };
 
-use blake2::{digest::consts::U32, Blake2b};
+use blake2::{Blake2b, digest::consts::U32};
 
 // Protocol types alias
 type D = Blake2b<U32>;

internal/cardano-node/mithril-cardano-node-chain/src/chain_observer/builder.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 use std::{fmt::Display, path::PathBuf, sync::Arc};
 use thiserror::Error;
 
-use mithril_common::entities::CardanoNetwork;
 use mithril_common::StdResult;
+use mithril_common::entities::CardanoNetwork;
 
 use crate::chain_observer::ChainObserver;
 use crate::test::double::FakeChainObserver;

internal/cardano-node/mithril-cardano-node-chain/src/chain_observer/cli_observer.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use async_trait::async_trait;
 use hex::FromHex;
 use nom::IResult;
@@ -9,7 +9,7 @@ use std::fs;
 use std::path::PathBuf;
 use tokio::process::Command;
 
-use mithril_common::crypto_helper::{encode_bech32, KesPeriod, OpCert, SerDeShelleyFileFormat};
+use mithril_common::crypto_helper::{KesPeriod, OpCert, SerDeShelleyFileFormat, encode_bech32};
 use mithril_common::entities::{BlockNumber, ChainPoint, Epoch, SlotNumber, StakeDistribution};
 use mithril_common::{CardanoNetwork, StdResult};
 
@@ -568,7 +568,7 @@ mod tests {
 
     use mithril_common::crypto_helper::ColdKeyGenerator;
 
-    use crate::test::test_cli_runner::{test_expected, TestCliRunner};
+    use crate::test::test_cli_runner::{TestCliRunner, test_expected};
 
     use super::*;
 

internal/cardano-node/mithril-cardano-node-chain/src/chain_observer/interface.rs

@@ -1,9 +1,9 @@
 use async_trait::async_trait;
 use thiserror::Error;
 
+use mithril_common::StdError;
 use mithril_common::crypto_helper::{KesPeriod, OpCert};
 use mithril_common::entities::{ChainPoint, Epoch, StakeDistribution};
-use mithril_common::StdError;
 
 use crate::entities::{ChainAddress, TxDatum};
 

internal/cardano-node/mithril-cardano-node-chain/src/chain_observer/pallas_observer.rs

@@ -1,31 +1,31 @@
 use std::collections::BTreeSet;
 use std::path::{Path, PathBuf};
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use async_trait::async_trait;
 use pallas_addresses::Address;
 use pallas_codec::utils::{Bytes, CborWrap, TagWrap};
 use pallas_network::{
     facades::NodeClient,
     miniprotocols::{
+        Point,
         localstate::{
+            Client,
             queries_v16::{
                 self, Addr, Addrs, ChainBlockNumber, GenesisConfig, PostAlonsoTransactionOutput,
                 StakeSnapshot, Stakes, TransactionOutput, UTxOByAddress,
             },
-            Client,
         },
-        Point,
     },
 };
 use pallas_primitives::ToCanonicalJson;
 use pallas_traverse::Era;
 
-use mithril_common::crypto_helper::{encode_bech32, KesPeriod, OpCert};
+use mithril_common::crypto_helper::{KesPeriod, OpCert, encode_bech32};
 use mithril_common::entities::{BlockNumber, ChainPoint, Epoch, SlotNumber, StakeDistribution};
 use mithril_common::{CardanoNetwork, StdResult};
 
-use crate::entities::{try_inspect, ChainAddress, Datum, Datums, TxDatum};
+use crate::entities::{ChainAddress, Datum, Datums, TxDatum, try_inspect};
 
 use super::{ChainObserver, ChainObserverError};
 
@@ -517,14 +517,14 @@ mod tests {
     use pallas_crypto::hash::Hash;
     use pallas_network::facades::NodeServer;
     use pallas_network::miniprotocols::{
+        Point,
         localstate::{
+            ClientQueryRequest,
             queries_v16::{
                 BlockQuery, ChainBlockNumber, Fraction, GenesisConfig, HardForkQuery, LedgerQuery,
                 Request, Snapshots, StakeSnapshot, SystemStart, Value,
             },
-            ClientQueryRequest,
         },
-        Point,
     };
     use tokio::net::UnixListener;
 

internal/cardano-node/mithril-cardano-node-chain/src/chain_reader/pallas_chain_reader.rs

@@ -1,17 +1,17 @@
 use std::path::{Path, PathBuf};
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use async_trait::async_trait;
 use pallas_network::{
     facades::NodeClient,
     miniprotocols::chainsync::{BlockContent, NextResponse},
 };
 use pallas_traverse::MultiEraBlock;
-use slog::{debug, Logger};
+use slog::{Logger, debug};
 
+use mithril_common::StdResult;
 use mithril_common::entities::CardanoNetwork;
 use mithril_common::logging::LoggerExtensions;
-use mithril_common::StdResult;
 
 use crate::entities::{ChainBlockNextAction, RawCardanoPoint, ScannedBlock};
 
@@ -153,8 +153,8 @@ mod tests {
     use pallas_network::{
         facades::NodeServer,
         miniprotocols::{
-            chainsync::{BlockContent, Tip},
             Point,
+            chainsync::{BlockContent, Tip},
         },
     };
     use std::fs;

internal/cardano-node/mithril-cardano-node-chain/src/chain_scanner/block_scanner.rs

@@ -4,8 +4,8 @@ use async_trait::async_trait;
 use slog::Logger;
 use tokio::sync::Mutex;
 
-use mithril_common::entities::BlockNumber;
 use mithril_common::StdResult;
+use mithril_common::entities::BlockNumber;
 
 use crate::chain_reader::ChainBlockReader;
 use crate::chain_scanner::{BlockScanner, BlockStreamer};

internal/cardano-node/mithril-cardano-node-chain/src/chain_scanner/chain_reader_block_streamer.rs

@@ -1,12 +1,12 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use slog::{debug, trace, Logger};
+use slog::{Logger, debug, trace};
 use tokio::sync::Mutex;
 
+use mithril_common::StdResult;
 use mithril_common::entities::BlockNumber;
 use mithril_common::logging::LoggerExtensions;
-use mithril_common::StdResult;
 
 use crate::chain_reader::ChainBlockReader;
 use crate::chain_scanner::{BlockStreamer, ChainScannedBlocks};
@@ -89,7 +89,7 @@ impl BlockStreamer for ChainReaderBlockStreamer {
                     } else {
                         chain_scanned_blocks = ChainScannedBlocks::RollForwards(roll_forwards);
                         Ok(Some(chain_scanned_blocks))
-                    }
+                    };
                 }
             }
         }
@@ -174,8 +174,8 @@ mod tests {
     use mithril_common::entities::SlotNumber;
 
     use crate::entities::ScannedBlock;
-    use crate::test::double::FakeChainReader;
     use crate::test::TestLogger;
+    use crate::test::double::FakeChainReader;
 
     use super::*;
 
@@ -482,8 +482,8 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_parse_expected_rollforward_when_rollbackward_on_different_point_and_have_previous_rollforwards(
-    ) {
+    async fn test_parse_expected_rollforward_when_rollbackward_on_different_point_and_have_previous_rollforwards()
+     {
         let chain_reader = Arc::new(Mutex::new(FakeChainReader::new(vec![
             ChainBlockNextAction::RollForward {
                 parsed_block: ScannedBlock::new(
@@ -539,8 +539,8 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_parse_expected_backward_when_rollbackward_on_different_point_and_does_not_have_previous_rollforwards(
-    ) {
+    async fn test_parse_expected_backward_when_rollbackward_on_different_point_and_does_not_have_previous_rollforwards()
+     {
         let chain_reader = Arc::new(Mutex::new(FakeChainReader::new(vec![
             ChainBlockNextAction::RollForward {
                 parsed_block: ScannedBlock::new(

internal/cardano-node/mithril-cardano-node-chain/src/chain_scanner/interface.rs

@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 
-use mithril_common::entities::{BlockNumber, SlotNumber};
 use mithril_common::StdResult;
+use mithril_common::entities::{BlockNumber, SlotNumber};
 
 use crate::entities::{RawCardanoPoint, ScannedBlock};
 

internal/cardano-node/mithril-cardano-node-chain/src/entities/datum.rs

@@ -1,6 +1,6 @@
-use anyhow::{anyhow, Context};
-use pallas_codec::minicbor::{decode, Decode, Decoder};
-use pallas_primitives::{alonzo::PlutusData, ToCanonicalJson};
+use anyhow::{Context, anyhow};
+use pallas_codec::minicbor::{Decode, Decoder, decode};
+use pallas_primitives::{ToCanonicalJson, alonzo::PlutusData};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;