fmt

backend/shard/src/json_message/hash.rs

@@ -1,7 +1,7 @@
+use serde::de::{self, Deserialize, Deserializer, SeqAccess, Unexpected, Visitor};
+use serde::ser::{Serialize, Serializer};
 use std::fmt::{self, Debug, Display};
 use std::str::FromStr;
-use serde::ser::{Serialize, Serializer};
-use serde::de::{self, Deserialize, Deserializer, Unexpected, Visitor, SeqAccess};
 
 const HASH_BYTES: usize = 32;
 
@@ -28,7 +28,9 @@ impl<'de> Visitor<'de> for HashVisitor {
     type Value = Hash;
 
     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        formatter.write_str("byte array of length 32, or hexidecimal string of 32 bytes beginning with 0x")
+        formatter.write_str(
+            "byte array of length 32, or hexidecimal string of 32 bytes beginning with 0x",
+        )
     }
 
     fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
@@ -65,7 +67,7 @@ impl<'de> Visitor<'de> for HashVisitor {
         for (i, byte) in hash.iter_mut().enumerate() {
             match seq.next_element()? {
                 Some(b) => *byte = b,
-                None => return Err(de::Error::invalid_length(i, &"an array of 32 bytes"))
+                None => return Err(de::Error::invalid_length(i, &"an array of 32 bytes")),
             }
         }
 
@@ -176,7 +178,6 @@ mod tests {
         assert_eq!(hash, DUMMY);
     }
 
-
     #[test]
     fn deserialize_json_array_too_short() {
         let json = r#"[222,173,190,239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]"#;

backend/shard/src/json_message/mod.rs

@@ -3,5 +3,5 @@
 mod hash;
 mod node_message;
 
+pub use hash::Hash;
 pub use node_message::*;
-pub use hash::Hash;

backend/shard/src/json_message/node_message.rs

@@ -4,9 +4,9 @@
 //! compatibility with the input data when we make changes to our internal data
 //! structures (for example, to support bincode better).
 use super::hash::Hash;
-use serde::{Deserialize};
 use common::node_message as internal;
 use common::node_types;
+use serde::Deserialize;
 
 /// This struct represents a telemetry message sent from a node as
 /// a JSON payload. Since JSON is self describing, we can use attributes
@@ -36,11 +36,12 @@ pub enum NodeMessage {
 impl From<NodeMessage> for internal::NodeMessage {
     fn from(msg: NodeMessage) -> Self {
         match msg {
-            NodeMessage::V1 { payload } => {
-                internal::NodeMessage::V1 { payload: payload.into() }
+            NodeMessage::V1 { payload } => internal::NodeMessage::V1 {
+                payload: payload.into(),
             },
-            NodeMessage::V2 { id, payload } => {
-                internal::NodeMessage::V2 { id, payload: payload.into() }
+            NodeMessage::V2 { id, payload } => internal::NodeMessage::V2 {
+                id,
+                payload: payload.into(),
             },
         }
     }
@@ -80,45 +81,19 @@ pub enum Payload {
 impl From<Payload> for internal::Payload {
     fn from(msg: Payload) -> Self {
         match msg {
-            Payload::SystemConnected(m) => {
-                internal::Payload::SystemConnected(m.into())
-            },
-            Payload::SystemInterval(m) => {
-                internal::Payload::SystemInterval(m.into())
-            },
-            Payload::BlockImport(m) => {
-                internal::Payload::BlockImport(m.into())
-            },
-            Payload::NotifyFinalized(m) => {
-                internal::Payload::NotifyFinalized(m.into())
-            },
-            Payload::TxPoolImport => {
-                internal::Payload::TxPoolImport
-            },
-            Payload::AfgFinalized(m) => {
-                internal::Payload::AfgFinalized(m.into())
-            },
-            Payload::AfgReceivedPrecommit(m) => {
-                internal::Payload::AfgReceivedPrecommit(m.into())
-            },
-            Payload::AfgReceivedPrevote(m) => {
-                internal::Payload::AfgReceivedPrevote(m.into())
-            },
-            Payload::AfgReceivedCommit(m) => {
-                internal::Payload::AfgReceivedCommit(m.into())
-            },
-            Payload::AfgAuthoritySet(m) => {
-                internal::Payload::AfgAuthoritySet(m.into())
-            },
-            Payload::AfgFinalizedBlocksUpTo => {
-                internal::Payload::AfgFinalizedBlocksUpTo
-            },
-            Payload::AuraPreSealedBlock => {
-                internal::Payload::AuraPreSealedBlock
-            },
-            Payload::PreparedBlockForProposing => {
-                internal::Payload::PreparedBlockForProposing
-            },
+            Payload::SystemConnected(m) => internal::Payload::SystemConnected(m.into()),
+            Payload::SystemInterval(m) => internal::Payload::SystemInterval(m.into()),
+            Payload::BlockImport(m) => internal::Payload::BlockImport(m.into()),
+            Payload::NotifyFinalized(m) => internal::Payload::NotifyFinalized(m.into()),
+            Payload::TxPoolImport => internal::Payload::TxPoolImport,
+            Payload::AfgFinalized(m) => internal::Payload::AfgFinalized(m.into()),
+            Payload::AfgReceivedPrecommit(m) => internal::Payload::AfgReceivedPrecommit(m.into()),
+            Payload::AfgReceivedPrevote(m) => internal::Payload::AfgReceivedPrevote(m.into()),
+            Payload::AfgReceivedCommit(m) => internal::Payload::AfgReceivedCommit(m.into()),
+            Payload::AfgAuthoritySet(m) => internal::Payload::AfgAuthoritySet(m.into()),
+            Payload::AfgFinalizedBlocksUpTo => internal::Payload::AfgFinalizedBlocksUpTo,
+            Payload::AuraPreSealedBlock => internal::Payload::AuraPreSealedBlock,
+            Payload::PreparedBlockForProposing => internal::Payload::PreparedBlockForProposing,
         }
     }
 }
@@ -134,7 +109,7 @@ impl From<SystemConnected> for internal::SystemConnected {
     fn from(msg: SystemConnected) -> Self {
         internal::SystemConnected {
             genesis_hash: msg.genesis_hash.into(),
-            node: msg.node.into()
+            node: msg.node.into(),
         }
     }
 }
@@ -243,7 +218,7 @@ impl From<Block> for node_types::Block {
     fn from(block: Block) -> Self {
         node_types::Block {
             hash: block.hash.into(),
-            height: block.height
+            height: block.height,
         }
     }
 }