Fmt version 2

iotaledger · Mar 26, 2021 · 1ddc3f3 · 1ddc3f3
1 parent 71f790d
commit 1ddc3f3
Show file tree

Hide file tree

Showing 23 changed files with 273 additions and 197 deletions.
diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/add_peer.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/add_peer.rs
@@ -68,7 +68,7 @@ pub(crate) async fn add_peer(
             return Err(reject::custom(CustomRejection::BadRequest(
                 "Invalid peer descriptor. The multi address did not have a valid peer id as its last segment."
                     .to_string(),
-            )))
+            )));
         }
     };
 

diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/milestone_utxo_changes.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/milestone_utxo_changes.rs
@@ -53,7 +53,7 @@ pub(crate) async fn milestone_utxo_changes<B: StorageBackend>(
         None => {
             return Err(reject::custom(CustomRejection::NotFound(
                 "can not find UTXO changes for given milestone index".to_string(),
-            )))
+            )));
         }
     };
     Ok(warp::reply::json(&SuccessBody::new(MilestoneUtxoChangesResponse {

diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/submit_message.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/submit_message.rs
@@ -142,11 +142,7 @@ pub(crate) async fn submit_message<B: StorageBackend>(
                     "invalid nonce: expected an u64-string".to_string(),
                 ))
             })?;
-        if parsed == 0 {
-            None
-        } else {
-            Some(parsed)
-        }
+        if parsed == 0 { None } else { Some(parsed) }
     };
 
     let message = if let Some(nonce) = nonce {

diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/transaction_included_message.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/transaction_included_message.rs
@@ -68,7 +68,7 @@ pub(crate) async fn transaction_included_message<B: StorageBackend>(
         None => {
             return Err(reject::custom(CustomRejection::NotFound(
                 "Can not find output".to_string(),
-            )))
+            )));
         }
     }
 }
diff --git a/bee-api/bee-rest-api/src/types/dtos.rs b/bee-api/bee-rest-api/src/types/dtos.rs
@@ -452,7 +452,7 @@ impl TryFrom<&RegularEssence> for RegularEssenceDto {
             payload: match value.payload() {
                 Some(Payload::Indexation(i)) => Some(PayloadDto::Indexation(Box::new(i.as_ref().into()))),
                 Some(_) => {
-                    return Err("invalid transaction essence: expected an optional indexation-payload".to_string())
+                    return Err("invalid transaction essence: expected an optional indexation-payload".to_string());
                 }
                 None => None,
             },
@@ -667,13 +667,13 @@ impl TryFrom<&UnlockBlockDto> for UnlockBlock {
             UnlockBlockDto::Signature(s) => match &s.signature {
                 SignatureDto::Ed25519(ed) => {
                     let mut public_key = [0u8; 32];
-                    hex::decode_to_slice(&ed.public_key, &mut public_key).map_err(|_| {
-                        "invalid public key in signature unlock block: expected a hex-string of length 64"
-                    })?; // TODO access ED25519_PUBLIC_KEY_LENGTH when available
+                    hex::decode_to_slice(&ed.public_key, &mut public_key).map_err(
+                        |_| "invalid public key in signature unlock block: expected a hex-string of length 64",
+                    )?; // TODO access ED25519_PUBLIC_KEY_LENGTH when available
                     let signature = hex::decode(&ed.signature)
-                        .map_err(|_| {
-                            "invalid signature in signature unlock block: expected a hex-string of length 128"
-                        })? // TODO access ED25519_SIGNATURE_LENGTH when available
+                        .map_err(
+                            |_| "invalid signature in signature unlock block: expected a hex-string of length 128",
+                        )? // TODO access ED25519_SIGNATURE_LENGTH when available
                         .into_boxed_slice();
                     Ok(UnlockBlock::Signature(SignatureUnlock::Ed25519(Ed25519Signature::new(
                         public_key, signature,

diff --git a/bee-ledger/src/types/receipt.rs b/bee-ledger/src/types/receipt.rs
@@ -43,7 +43,7 @@ impl Receipt {
                 None => {
                     return Err(Error::InvalidMigratedFundsAmount(
                         migrated_amount + funds.output().amount(),
-                    ))
+                    ));
                 }
             }
         }
@@ -62,7 +62,7 @@ impl Receipt {
             None => {
                 return Err(Error::InvalidMigratedFundsAmount(
                     consumed_treasury_output.inner().amount() - migrated_amount,
-                ))
+                ));
             }
         };
 

diff --git a/bee-message/tests/message.rs b/bee-message/tests/message.rs
@@ -60,16 +60,18 @@ fn invalid_length() {
 
 #[test]
 fn unpack_valid_no_remaining_bytes() {
-    assert!(Message::unpack(
-        &mut vec![
-            42, 0, 0, 0, 0, 0, 0, 0, 2, 140, 28, 186, 52, 147, 145, 96, 9, 105, 89, 78, 139, 3, 71, 249, 97, 149, 190,
-            63, 238, 168, 202, 82, 140, 227, 66, 173, 19, 110, 93, 117, 34, 225, 202, 251, 10, 156, 58, 144, 225, 54,
-            79, 62, 38, 20, 121, 95, 90, 112, 109, 6, 166, 126, 145, 13, 62, 52, 68, 248, 135, 223, 119, 137, 13, 0, 0,
-            0, 0, 21, 205, 91, 7, 0, 0, 0, 0,
-        ]
-        .as_slice()
+    assert!(
+        Message::unpack(
+            &mut vec![
+                42, 0, 0, 0, 0, 0, 0, 0, 2, 140, 28, 186, 52, 147, 145, 96, 9, 105, 89, 78, 139, 3, 71, 249, 97, 149,
+                190, 63, 238, 168, 202, 82, 140, 227, 66, 173, 19, 110, 93, 117, 34, 225, 202, 251, 10, 156, 58, 144,
+                225, 54, 79, 62, 38, 20, 121, 95, 90, 112, 109, 6, 166, 126, 145, 13, 62, 52, 68, 248, 135, 223, 119,
+                137, 13, 0, 0, 0, 0, 21, 205, 91, 7, 0, 0, 0, 0,
+            ]
+            .as_slice()
+        )
+        .is_ok()
     )
-    .is_ok())
 }
 
 #[test]

diff --git a/bee-message/tests/milestone_payload_essence.rs b/bee-message/tests/milestone_payload_essence.rs
@@ -36,15 +36,19 @@ fn new_invalid_too_many_public_keys() {
 
 #[test]
 fn new_valid_sorted_unique_public_keys() {
-    assert!(MilestonePayloadEssence::new(
-        MilestoneIndex(0),
-        0,
-        rand_parents(),
-        [0; MILESTONE_MERKLE_PROOF_LENGTH],
-        vec![[0; 32], [1; 32], [2; 32], [3; 32], [4; 32], [5; 32], [6; 32], [7; 32], [8; 32], [9; 32]],
-        None,
-    )
-    .is_ok());
+    assert!(
+        MilestonePayloadEssence::new(
+            MilestoneIndex(0),
+            0,
+            rand_parents(),
+            [0; MILESTONE_MERKLE_PROOF_LENGTH],
+            vec![
+                [0; 32], [1; 32], [2; 32], [3; 32], [4; 32], [5; 32], [6; 32], [7; 32], [8; 32], [9; 32]
+            ],
+            None,
+        )
+        .is_ok()
+    );
 }
 
 #[test]
@@ -55,7 +59,9 @@ fn new_invalid_sorted_not_unique_public_keys() {
             0,
             rand_parents(),
             [0; MILESTONE_MERKLE_PROOF_LENGTH],
-            vec![[0; 32], [1; 32], [2; 32], [3; 32], [4; 32], [4; 32], [6; 32], [7; 32], [8; 32], [9; 32]],
+            vec![
+                [0; 32], [1; 32], [2; 32], [3; 32], [4; 32], [4; 32], [6; 32], [7; 32], [8; 32], [9; 32]
+            ],
             None,
         ),
         Err(Error::MilestonePublicKeysNotUniqueSorted)
@@ -70,7 +76,9 @@ fn new_invalid_not_sorted_unique_public_keys() {
             0,
             rand_parents(),
             [0; MILESTONE_MERKLE_PROOF_LENGTH],
-            vec![[0; 32], [1; 32], [3; 32], [2; 32], [4; 32], [5; 32], [6; 32], [7; 32], [8; 32], [9; 32]],
+            vec![
+                [0; 32], [1; 32], [3; 32], [2; 32], [4; 32], [5; 32], [6; 32], [7; 32], [8; 32], [9; 32]
+            ],
             None,
         ),
         Err(Error::MilestonePublicKeysNotUniqueSorted)

diff --git a/bee-message/tests/unlock_blocks.rs b/bee-message/tests/unlock_blocks.rs
@@ -65,21 +65,23 @@ fn new_invalid_duplicate_signature() {
 
 #[test]
 fn new_valid() {
-    assert!(UnlockBlocks::new(vec![
-        SignatureUnlock::from(Ed25519Signature::new([0; 32], Box::new([0; 64]))).into(),
-        ReferenceUnlock::new(0).unwrap().into(),
-        ReferenceUnlock::new(0).unwrap().into(),
-        SignatureUnlock::from(Ed25519Signature::new([1; 32], Box::new([1; 64]))).into(),
-        SignatureUnlock::from(Ed25519Signature::new([2; 32], Box::new([2; 64]))).into(),
-        SignatureUnlock::from(Ed25519Signature::new([3; 32], Box::new([3; 64]))).into(),
-        ReferenceUnlock::new(3).unwrap().into(),
-        ReferenceUnlock::new(4).unwrap().into(),
-        ReferenceUnlock::new(3).unwrap().into(),
-        ReferenceUnlock::new(4).unwrap().into(),
-        ReferenceUnlock::new(5).unwrap().into(),
-        SignatureUnlock::from(Ed25519Signature::new([4; 32], Box::new([4; 64]))).into(),
-        ReferenceUnlock::new(11).unwrap().into(),
-        SignatureUnlock::from(Ed25519Signature::new([5; 32], Box::new([5; 64]))).into(),
-    ])
-    .is_ok());
+    assert!(
+        UnlockBlocks::new(vec![
+            SignatureUnlock::from(Ed25519Signature::new([0; 32], Box::new([0; 64]))).into(),
+            ReferenceUnlock::new(0).unwrap().into(),
+            ReferenceUnlock::new(0).unwrap().into(),
+            SignatureUnlock::from(Ed25519Signature::new([1; 32], Box::new([1; 64]))).into(),
+            SignatureUnlock::from(Ed25519Signature::new([2; 32], Box::new([2; 64]))).into(),
+            SignatureUnlock::from(Ed25519Signature::new([3; 32], Box::new([3; 64]))).into(),
+            ReferenceUnlock::new(3).unwrap().into(),
+            ReferenceUnlock::new(4).unwrap().into(),
+            ReferenceUnlock::new(3).unwrap().into(),
+            ReferenceUnlock::new(4).unwrap().into(),
+            ReferenceUnlock::new(5).unwrap().into(),
+            SignatureUnlock::from(Ed25519Signature::new([4; 32], Box::new([4; 64]))).into(),
+            ReferenceUnlock::new(11).unwrap().into(),
+            SignatureUnlock::from(Ed25519Signature::new([5; 32], Box::new([5; 64]))).into(),
+        ])
+        .is_ok()
+    );
 }
diff --git a/bee-network/src/peer/peerlist.rs b/bee-network/src/peer/peerlist.rs
@@ -172,11 +172,7 @@ impl PeerList {
         self.0.read().await.iter().fold(
             0,
             |count, (_, (info, state))| {
-                if predicate(info, state) {
-                    count + 1
-                } else {
-                    count
-                }
+                if predicate(info, state) { count + 1 } else { count }
             },
         )
     }

diff --git a/bee-node/src/node/error.rs b/bee-node/src/node/error.rs
@@ -5,7 +5,9 @@ use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum Error {
-    #[error("Invalid or no identity private key provided. Add the newly generated {0} (or generate one with `bee p2p-identity`) to the configuration file and re-run the node.")]
+    #[error(
+        "Invalid or no identity private key provided. Add the newly generated {0} (or generate one with `bee p2p-identity`) to the configuration file and re-run the node."
+    )]
     InvalidOrNoIdentityPrivateKey(String),
     #[error("Storage backend operation failed: {0}.")]
     StorageBackend(Box<dyn std::error::Error>),

diff --git a/bee-snapshot/src/worker.rs b/bee-snapshot/src/worker.rs
@@ -216,14 +216,13 @@ async fn import_snapshot<B: StorageBackend>(
     info!(
         "Imported {} snapshot file from {} with sep index {}, ledger index {}, {} solid entry points{} and {} milestone diffs.",
         kind_str,
-        Utc.timestamp(header.timestamp() as i64, 0)
-            .format("%d-%m-%Y %H:%M:%S"),
+        Utc.timestamp(header.timestamp() as i64, 0).format("%d-%m-%Y %H:%M:%S"),
         *header.sep_index(),
         *header.ledger_index(),
         header.sep_count(),
         match header.kind() {
-            Kind::Full=> format!(", {} outputs", header.output_count()),
-            Kind::Delta=> "".to_owned()
+            Kind::Full => format!(", {} outputs", header.output_count()),
+            Kind::Delta => "".to_owned(),
         },
         header.milestone_diff_count()
     );

diff --git a/bee-storage/bee-storage-rocksdb/tests/address_to_balance.rs b/bee-storage/bee-storage-rocksdb/tests/address_to_balance.rs
@@ -27,10 +27,12 @@ async fn access() {
     let (address, balance) = (rand_address(), rand_balance());
 
     assert!(!Exist::<Address, Balance>::exist(&storage, &address).await.unwrap());
-    assert!(Fetch::<Address, Balance>::fetch(&storage, &address)
-        .await
-        .unwrap()
-        .is_none());
+    assert!(
+        Fetch::<Address, Balance>::fetch(&storage, &address)
+            .await
+            .unwrap()
+            .is_none()
+    );
 
     Insert::<Address, Balance>::insert(&storage, &address, &balance)
         .await
@@ -49,10 +51,12 @@ async fn access() {
     Delete::<Address, Balance>::delete(&storage, &address).await.unwrap();
 
     assert!(!Exist::<Address, Balance>::exist(&storage, &address).await.unwrap());
-    assert!(Fetch::<Address, Balance>::fetch(&storage, &address)
-        .await
-        .unwrap()
-        .is_none());
+    assert!(
+        Fetch::<Address, Balance>::fetch(&storage, &address)
+            .await
+            .unwrap()
+            .is_none()
+    );
 
     let mut batch = Storage::batch_begin();
 

diff --git a/bee-storage/bee-storage-rocksdb/tests/index_to_message_id.rs b/bee-storage/bee-storage-rocksdb/tests/index_to_message_id.rs
@@ -29,11 +29,13 @@ async fn access() {
             .await
             .unwrap()
     );
-    assert!(Fetch::<HashedIndex, Vec<MessageId>>::fetch(&storage, &index)
-        .await
-        .unwrap()
-        .unwrap()
-        .is_empty());
+    assert!(
+        Fetch::<HashedIndex, Vec<MessageId>>::fetch(&storage, &index)
+            .await
+            .unwrap()
+            .unwrap()
+            .is_empty()
+    );
 
     Insert::<(HashedIndex, MessageId), ()>::insert(&storage, &(index, message_id), &())
         .await
@@ -61,11 +63,13 @@ async fn access() {
             .await
             .unwrap()
     );
-    assert!(Fetch::<HashedIndex, Vec<MessageId>>::fetch(&storage, &index)
-        .await
-        .unwrap()
-        .unwrap()
-        .is_empty());
+    assert!(
+        Fetch::<HashedIndex, Vec<MessageId>>::fetch(&storage, &index)
+            .await
+            .unwrap()
+            .unwrap()
+            .is_empty()
+    );
 
     let mut batch = Storage::batch_begin();
 

diff --git a/bee-storage/bee-storage-rocksdb/tests/message_id_to_message.rs b/bee-storage/bee-storage-rocksdb/tests/message_id_to_message.rs
@@ -26,10 +26,12 @@ async fn access() {
     let (message_id, message) = (rand_message_id(), rand_message());
 
     assert!(!Exist::<MessageId, Message>::exist(&storage, &message_id).await.unwrap());
-    assert!(Fetch::<MessageId, Message>::fetch(&storage, &message_id)
-        .await
-        .unwrap()
-        .is_none());
+    assert!(
+        Fetch::<MessageId, Message>::fetch(&storage, &message_id)
+            .await
+            .unwrap()
+            .is_none()
+    );
 
     Insert::<MessageId, Message>::insert(&storage, &message_id, &message)
         .await
@@ -50,10 +52,12 @@ async fn access() {
         .unwrap();
 
     assert!(!Exist::<MessageId, Message>::exist(&storage, &message_id).await.unwrap());
-    assert!(Fetch::<MessageId, Message>::fetch(&storage, &message_id)
-        .await
-        .unwrap()
-        .is_none());
+    assert!(
+        Fetch::<MessageId, Message>::fetch(&storage, &message_id)
+            .await
+            .unwrap()
+            .is_none()
+    );
 
     let mut batch = Storage::batch_begin();
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,7 +68,7 @@ pub(crate) async fn add_peer( @@
                 return Err(reject::custom(CustomRejection::BadRequest(
                     "Invalid peer descriptor. The multi address did not have a valid peer id as its last segment."
                         .to_string(),
-                )))
+                )));
             }
         };
@@ Expand Down @@