cargo fmt

This commit is contained in:
James Wilson
2021-07-13 16:51:24 +01:00
parent 9ac5ea7624
commit c1208b9e81
13 changed files with 466 additions and 306 deletions
+104 -47
View File
@@ -1,4 +1,6 @@
use common::node_types::{BlockDetails, BlockHash, BlockNumber, NodeLocation, NodeStats, Timestamp};
use common::node_types::{
BlockDetails, BlockHash, BlockNumber, NodeLocation, NodeStats, Timestamp,
};
use serde_json::value::RawValue;
#[derive(Debug, PartialEq)]
@@ -77,7 +79,7 @@ pub enum FeedMessage {
address: String,
block_number: BlockNumber,
block_hash: BlockHash,
voter: Option<String>
voter: Option<String>,
},
AfgReceivedPrecommit {
address: String,
@@ -85,7 +87,8 @@ pub enum FeedMessage {
block_hash: BlockHash,
voter: Option<String>,
},
AfgAuthoritySet { // Not used currently; not sure what "address" params are:
AfgAuthoritySet {
// Not used currently; not sure what "address" params are:
a1: String,
a2: String,
a3: String,
@@ -102,8 +105,8 @@ pub enum FeedMessage {
/// A "special" case when we don't know how to decode an action:
UnknownValue {
action: u8,
value: String
}
value: String,
},
}
#[derive(Debug, PartialEq)]
@@ -138,22 +141,30 @@ impl FeedMessage {
0 => {
let version = serde_json::from_str(raw_val.get())?;
FeedMessage::Version(version)
},
}
// BestBlock
1 => {
let (block_number, timestamp, avg_block_time) = serde_json::from_str(raw_val.get())?;
FeedMessage::BestBlock { block_number, timestamp, avg_block_time }
},
let (block_number, timestamp, avg_block_time) =
serde_json::from_str(raw_val.get())?;
FeedMessage::BestBlock {
block_number,
timestamp,
avg_block_time,
}
}
// BestFinalized
2 => {
let (block_number, block_hash) = serde_json::from_str(raw_val.get())?;
FeedMessage::BestFinalized { block_number, block_hash }
FeedMessage::BestFinalized {
block_number,
block_hash,
}
}
// AddNode
3 => {
let (
node_id,
( name, implementation, version, validator, network_id ),
(name, implementation, version, validator, network_id),
stats,
io,
hardware,
@@ -163,113 +174,153 @@ impl FeedMessage {
) = serde_json::from_str(raw_val.get())?;
// Give these two types but don't use the results:
let (_,_): (&RawValue, &RawValue) = (io, hardware);
let (_, _): (&RawValue, &RawValue) = (io, hardware);
FeedMessage::AddedNode {
node_id,
node: NodeDetails { name, implementation, version, validator, network_id },
node: NodeDetails {
name,
implementation,
version,
validator,
network_id,
},
stats,
block_details,
location,
startup_time,
}
},
}
// RemoveNode
4 => {
let node_id = serde_json::from_str(raw_val.get())?;
FeedMessage::RemovedNode { node_id }
},
}
// LocatedNode
5 => {
let (node_id, lat, long, city) = serde_json::from_str(raw_val.get())?;
FeedMessage::LocatedNode { node_id, lat, long, city }
},
FeedMessage::LocatedNode {
node_id,
lat,
long,
city,
}
}
// ImportedBlock
6 => {
let (node_id, block_details) = serde_json::from_str(raw_val.get())?;
FeedMessage::ImportedBlock { node_id, block_details }
},
FeedMessage::ImportedBlock {
node_id,
block_details,
}
}
// FinalizedBlock
7 => {
let (node_id, block_number, block_hash) = serde_json::from_str(raw_val.get())?;
FeedMessage::FinalizedBlock { node_id, block_number, block_hash }
},
FeedMessage::FinalizedBlock {
node_id,
block_number,
block_hash,
}
}
// NodeStatsUpdate
8 => {
let (node_id, stats) = serde_json::from_str(raw_val.get())?;
FeedMessage::NodeStatsUpdate { node_id, stats }
},
}
// Hardware
9 => {
let (node_id, _hardware): (_, &RawValue) = serde_json::from_str(raw_val.get())?;
FeedMessage::Hardware { node_id }
},
}
// TimeSync
10 => {
let time = serde_json::from_str(raw_val.get())?;
FeedMessage::TimeSync { time }
},
}
// AddedChain
11 => {
let (name, node_count) = serde_json::from_str(raw_val.get())?;
FeedMessage::AddedChain { name, node_count }
},
}
// RemovedChain
12 => {
let name = serde_json::from_str(raw_val.get())?;
FeedMessage::RemovedChain { name }
},
}
// SubscribedTo
13 => {
let name = serde_json::from_str(raw_val.get())?;
FeedMessage::SubscribedTo { name }
},
}
// UnsubscribedFrom
14 => {
let name = serde_json::from_str(raw_val.get())?;
FeedMessage::UnsubscribedFrom { name }
},
}
// Pong
15 => {
let msg = serde_json::from_str(raw_val.get())?;
FeedMessage::Pong { msg }
},
}
// AfgFinalized
16 => {
let (address, block_number, block_hash) = serde_json::from_str(raw_val.get())?;
FeedMessage::AfgFinalized { address, block_number, block_hash }
},
FeedMessage::AfgFinalized {
address,
block_number,
block_hash,
}
}
// AfgReceivedPrevote
17 => {
let (address, block_number, block_hash, voter) = serde_json::from_str(raw_val.get())?;
FeedMessage::AfgReceivedPrevote { address, block_number, block_hash, voter }
},
let (address, block_number, block_hash, voter) =
serde_json::from_str(raw_val.get())?;
FeedMessage::AfgReceivedPrevote {
address,
block_number,
block_hash,
voter,
}
}
// AfgReceivedPrecommit
18 => {
let (address, block_number, block_hash, voter) = serde_json::from_str(raw_val.get())?;
FeedMessage::AfgReceivedPrecommit { address, block_number, block_hash, voter }
},
let (address, block_number, block_hash, voter) =
serde_json::from_str(raw_val.get())?;
FeedMessage::AfgReceivedPrecommit {
address,
block_number,
block_hash,
voter,
}
}
// AfgAuthoritySet
19 => {
let (a1, a2, a3, block_number, block_hash) = serde_json::from_str(raw_val.get())?;
FeedMessage::AfgAuthoritySet { a1, a2, a3, block_number, block_hash }
},
FeedMessage::AfgAuthoritySet {
a1,
a2,
a3,
block_number,
block_hash,
}
}
// StaleNode
20 => {
let node_id = serde_json::from_str(raw_val.get())?;
FeedMessage::StaleNode { node_id }
},
}
// NodeIOUpdate
21 => {
// ignore NodeIO for now:
let (node_id, _node_io): (_, &RawValue) = serde_json::from_str(raw_val.get())?;
FeedMessage::NodeIOUpdate { node_id }
},
}
// A catchall for messages we don't know/care about yet:
_ => {
let value = raw_val.to_string();
FeedMessage::UnknownValue { action, value }
},
}
};
Ok(feed_message)
@@ -288,7 +339,9 @@ mod test {
assert_eq!(
FeedMessage::from_bytes(msg.as_bytes()).unwrap(),
vec![FeedMessage::RemovedChain { name: "".to_owned() }]
vec![FeedMessage::RemovedChain {
name: "".to_owned()
}]
);
}
@@ -300,10 +353,14 @@ mod test {
assert_eq!(
FeedMessage::from_bytes(msg.as_bytes()).unwrap(),
vec![
FeedMessage::RemovedChain { name: "".to_owned() },
FeedMessage::AddedChain { name: "Local Testnet".to_owned(), node_count: 1 },
FeedMessage::RemovedChain {
name: "".to_owned()
},
FeedMessage::AddedChain {
name: "Local Testnet".to_owned(),
node_count: 1
},
]
);
}
}
}