From 79bf80719b901ec7198170cbe9b5590382cdcdf3 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Sat, 27 Oct 2018 13:35:08 +0200
Subject: [PATCH] comply latest fmt & clippy versions
---
conf/lib.rs | 12 ++--
dal/writers/transaction.rs | 16 ++---
.../blockchain/v10/documents/transaction.rs | 42 +++++--------
network/network_head.rs | 60 +++++++++----------
tui/lib.rs | 2 +-
wotb/lib.rs | 16 ++---
ws2p-v1-legacy/datas.rs | 16 ++---
ws2p-v1-legacy/lib.rs | 18 +++---
ws2p-v1-legacy/parsers/mod.rs | 30 ++++------
ws2p-v1-legacy/parsers/transactions.rs | 20 +++----
ws2p/lib.rs | 2 +-
11 files changed, 104 insertions(+), 130 deletions(-)
diff --git a/conf/lib.rs b/conf/lib.rs
index 3b312538..5461e8e8 100644
--- a/conf/lib.rs
+++ b/conf/lib.rs
@@ -411,13 +411,11 @@ pub fn write_keypairs_file(
keypairs: &DuniterKeyPairs,
) -> Result<(), std::io::Error> {
let mut f = try!(File::create(file_path.as_path()));
- try!(
- f.write_all(
- serde_json::to_string_pretty(keypairs)
- .expect("Fatal error : fail to write default keypairs file !")
- .as_bytes()
- )
- );
+ try!(f.write_all(
+ serde_json::to_string_pretty(keypairs)
+ .expect("Fatal error : fail to write default keypairs file !")
+ .as_bytes()
+ ));
try!(f.sync_all());
Ok(())
}
diff --git a/dal/writers/transaction.rs b/dal/writers/transaction.rs
index 6fb57faa..b0733ebe 100644
--- a/dal/writers/transaction.rs
+++ b/dal/writers/transaction.rs
@@ -432,16 +432,12 @@ mod tests {
blockstamp: &block,
locktime: &0,
issuers: &vec![pubkey],
- inputs: &vec![
- TransactionInput::parse_from_str(
- "1000:0:D:2ny7YAdmzReQxAayyJZsyVYwYhVyax2thKcGknmQy5nQ:1",
- )
- .expect("fail to parse input !"),
- ],
- unlocks: &vec![
- TransactionInputUnlocks::parse_from_str("0:SIG(0)")
- .expect("fail to parse unlock !"),
- ],
+ inputs: &vec![TransactionInput::parse_from_str(
+ "1000:0:D:2ny7YAdmzReQxAayyJZsyVYwYhVyax2thKcGknmQy5nQ:1",
+ )
+ .expect("fail to parse input !")],
+ unlocks: &vec![TransactionInputUnlocks::parse_from_str("0:SIG(0)")
+ .expect("fail to parse unlock !")],
outputs: &vec![
TransactionOutput::parse_from_str(
"1:0:SIG(Com8rJukCozHZyFao6AheSsfDQdPApxQRnz7QYFf64mm)",
diff --git a/documents/blockchain/v10/documents/transaction.rs b/documents/blockchain/v10/documents/transaction.rs
index e436508b..077e3350 100644
--- a/documents/blockchain/v10/documents/transaction.rs
+++ b/documents/blockchain/v10/documents/transaction.rs
@@ -847,22 +847,16 @@ mod tests {
blockstamp: &block,
locktime: &0,
issuers: &vec![pubkey],
- inputs: &vec![
- TransactionInput::parse_from_str(
- "10:0:D:DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:0",
- )
- .expect("fail to parse input !"),
- ],
- unlocks: &vec![
- TransactionInputUnlocks::parse_from_str("0:SIG(0)")
- .expect("fail to parse unlock !"),
- ],
- outputs: &vec![
- TransactionOutput::parse_from_str(
- "10:0:SIG(FD9wujR7KABw88RyKEGBYRLz8PA6jzVCbcBAsrBXBqSa)",
- )
- .expect("fail to parse output !"),
- ],
+ inputs: &vec![TransactionInput::parse_from_str(
+ "10:0:D:DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:0",
+ )
+ .expect("fail to parse input !")],
+ unlocks: &vec![TransactionInputUnlocks::parse_from_str("0:SIG(0)")
+ .expect("fail to parse unlock !")],
+ outputs: &vec![TransactionOutput::parse_from_str(
+ "10:0:SIG(FD9wujR7KABw88RyKEGBYRLz8PA6jzVCbcBAsrBXBqSa)",
+ )
+ .expect("fail to parse output !")],
comment: "test",
hash: None,
};
@@ -901,16 +895,12 @@ mod tests {
blockstamp: &block,
locktime: &0,
issuers: &vec![pubkey],
- inputs: &vec![
- TransactionInput::parse_from_str(
- "950:0:T:2CF1ACD8FE8DC93EE39A1D55881C50D87C55892AE8E4DB71D4EBAB3D412AA8FD:1",
- )
- .expect("fail to parse input !"),
- ],
- unlocks: &vec![
- TransactionInputUnlocks::parse_from_str("0:SIG(0)")
- .expect("fail to parse unlock !"),
- ],
+ inputs: &vec![TransactionInput::parse_from_str(
+ "950:0:T:2CF1ACD8FE8DC93EE39A1D55881C50D87C55892AE8E4DB71D4EBAB3D412AA8FD:1",
+ )
+ .expect("fail to parse input !")],
+ unlocks: &vec![TransactionInputUnlocks::parse_from_str("0:SIG(0)")
+ .expect("fail to parse unlock !")],
outputs: &vec![
TransactionOutput::parse_from_str(
"30:0:SIG(38MEAZN68Pz1DTvT3tqgxx4yQP6snJCQhPqEFxbDk4aE)",
diff --git a/network/network_head.rs b/network/network_head.rs
index f9ea9db5..92298951 100644
--- a/network/network_head.rs
+++ b/network/network_head.rs
@@ -197,39 +197,39 @@ impl NetworkHead {
match message {
NetworkHeadMessage::V2(_) => Ok(NetworkHead::V2(Box::new(NetworkHeadV2 {
message,
- sig: Sig::Ed25519(ed25519::Signature::from_base64(if let Some(str_sig) =
- source.get("sig")
- {
- if let Some(str_sig) = str_sig.as_str() {
- str_sig
+ sig: Sig::Ed25519(ed25519::Signature::from_base64(
+ if let Some(str_sig) = source.get("sig") {
+ if let Some(str_sig) = str_sig.as_str() {
+ str_sig
+ } else {
+ return Err(NetworkHeadParseErr::InvalidStr("sig"));
+ }
} else {
- return Err(NetworkHeadParseErr::InvalidStr("sig"));
- }
- } else {
- return Err(NetworkHeadParseErr::MissingField("sigV2"));
- })?),
- message_v2: NetworkHeadMessage::from_str(if let Some(str_msg) =
- source.get("messageV2")
- {
- if let Some(str_msg) = str_msg.as_str() {
- str_msg
+ return Err(NetworkHeadParseErr::MissingField("sigV2"));
+ },
+ )?),
+ message_v2: NetworkHeadMessage::from_str(
+ if let Some(str_msg) = source.get("messageV2") {
+ if let Some(str_msg) = str_msg.as_str() {
+ str_msg
+ } else {
+ return Err(NetworkHeadParseErr::InvalidStr("messageV2"));
+ }
} else {
- return Err(NetworkHeadParseErr::InvalidStr("messageV2"));
- }
- } else {
- return Err(NetworkHeadParseErr::MissingField("messageV2"));
- })?,
- sig_v2: Sig::Ed25519(ed25519::Signature::from_base64(if let Some(str_sig) =
- source.get("sigV2")
- {
- if let Some(str_sig) = str_sig.as_str() {
- str_sig
+ return Err(NetworkHeadParseErr::MissingField("messageV2"));
+ },
+ )?,
+ sig_v2: Sig::Ed25519(ed25519::Signature::from_base64(
+ if let Some(str_sig) = source.get("sigV2") {
+ if let Some(str_sig) = str_sig.as_str() {
+ str_sig
+ } else {
+ return Err(NetworkHeadParseErr::InvalidStr("sigV2"));
+ }
} else {
- return Err(NetworkHeadParseErr::InvalidStr("sigV2"));
- }
- } else {
- return Err(NetworkHeadParseErr::MissingField("sigV2"));
- })?),
+ return Err(NetworkHeadParseErr::MissingField("sigV2"));
+ },
+ )?),
step: if let Some(step) = source.get("step") {
if let Some(step) = step.as_u64() {
step as u32
diff --git a/tui/lib.rs b/tui/lib.rs
index 18cd3a7f..b9d3f1f1 100644
--- a/tui/lib.rs
+++ b/tui/lib.rs
@@ -411,7 +411,7 @@ impl DuniterModule<DuRsConf, DursMsg> for TuiModule {
_keys: RequiredKeysContent,
module_conf: Self::ModuleConf,
subcommand_args: TuiOpt,
- ) -> () {
+ ) {
let mut conf = soft_meta_datas.conf.clone();
let new_tui_conf = TuiConf {
test_fake_conf_field: subcommand_args.new_conf_field.clone(),
diff --git a/wotb/lib.rs b/wotb/lib.rs
index 3926037b..a7a0c4f8 100644
--- a/wotb/lib.rs
+++ b/wotb/lib.rs
@@ -329,11 +329,9 @@ mod tests {
path_finder.find_paths(&wot, NodeId(3), NodeId(0), 2).len(),
1
); // It exists 3 -> 2 -> 0
- assert!(
- path_finder
- .find_paths(&wot, NodeId(3), NodeId(0), 2)
- .contains(&vec![NodeId(3), NodeId(2), NodeId(0)])
- );
+ assert!(path_finder
+ .find_paths(&wot, NodeId(3), NodeId(0), 2)
+ .contains(&vec![NodeId(3), NodeId(2), NodeId(0)]));
assert_eq!(
distance_calculator.is_outdistanced(
@@ -407,11 +405,9 @@ mod tests {
path_finder.find_paths(&wot, NodeId(3), NodeId(0), 2).len(),
1
); // It exists 3 -> 2 -> 0
- assert!(
- path_finder
- .find_paths(&wot, NodeId(3), NodeId(0), 2)
- .contains(&vec![NodeId(3), NodeId(2), NodeId(0)])
- );
+ assert!(path_finder
+ .find_paths(&wot, NodeId(3), NodeId(0), 2)
+ .contains(&vec![NodeId(3), NodeId(2), NodeId(0)]));
assert_eq!(
distance_calculator.is_outdistanced(
diff --git a/ws2p-v1-legacy/datas.rs b/ws2p-v1-legacy/datas.rs
index 6658c623..48f0c125 100644
--- a/ws2p-v1-legacy/datas.rs
+++ b/ws2p-v1-legacy/datas.rs
@@ -161,7 +161,7 @@ impl WS2PModuleDatas {
}
count_established_connections
}
- pub fn connect_to_know_endpoints(&mut self) -> () {
+ pub fn connect_to_know_endpoints(&mut self) {
info!("WS2P: connect to know endpoints...");
let mut count_established_connections = 0;
let mut pubkeys = HashSet::new();
@@ -205,7 +205,7 @@ impl WS2PModuleDatas {
}
}
}
- pub fn connect_to(&mut self, endpoint: &EndpointEnum) -> () {
+ pub fn connect_to(&mut self, endpoint: &EndpointEnum) {
// Add endpoint to endpoints list (if there isn't already)
match self.ws2p_endpoints.get(
&endpoint
@@ -340,11 +340,13 @@ impl WS2PModuleDatas {
for head in heads {
if let Ok(head) = NetworkHead::from_json_value(&head) {
if head.verify()
- && (self.my_head.is_none() || head.node_full_id() != self
- .my_head
- .clone()
- .expect("WS2P: Fail to clone my_head")
- .node_full_id())
+ && (self.my_head.is_none()
+ || head.node_full_id()
+ != self
+ .my_head
+ .clone()
+ .expect("WS2P: Fail to clone my_head")
+ .node_full_id())
&& head.apply(&mut self.heads_cache)
{
applied_heads.push(head);
diff --git a/ws2p-v1-legacy/lib.rs b/ws2p-v1-legacy/lib.rs
index da78ce28..3e7e662f 100644
--- a/ws2p-v1-legacy/lib.rs
+++ b/ws2p-v1-legacy/lib.rs
@@ -265,7 +265,7 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
_keys: RequiredKeysContent,
_module_conf: Self::ModuleConf,
_subcommand_args: WS2POpt,
- ) -> () {
+ ) {
println!("Succesfully exec ws2p subcommand !")
}
fn start(
@@ -537,9 +537,10 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
));
}
ws2p_module.send_network_event(
- &NetworkEvent::ReceiveHeads(vec![
- ws2p_module.my_head.clone().unwrap(),
- ]),
+ &NetworkEvent::ReceiveHeads(vec![ws2p_module
+ .my_head
+ .clone()
+ .unwrap()]),
);
}
DALResBlockchain::UIDs(ref _req_id, ref uids) => {
@@ -900,10 +901,11 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
info!(
"Write {} endpoint in {} secs.",
ep_full_id,
- *DURATION_BEFORE_RECORDING_ENDPOINT - SystemTime::now()
- .duration_since(received_time)
- .unwrap()
- .as_secs()
+ *DURATION_BEFORE_RECORDING_ENDPOINT
+ - SystemTime::now()
+ .duration_since(received_time)
+ .unwrap()
+ .as_secs()
);
}
}
diff --git a/ws2p-v1-legacy/parsers/mod.rs b/ws2p-v1-legacy/parsers/mod.rs
index 7796b278..decd00fa 100644
--- a/ws2p-v1-legacy/parsers/mod.rs
+++ b/ws2p-v1-legacy/parsers/mod.rs
@@ -65,18 +65,14 @@ mod tests {
ed25519::PublicKey::from_base58("51EFVNZwpfmTXU7BSLpeh3PZFgfdmm5hq5MzCDopdH2")
.unwrap(),
)],
- inputs: &vec![
- TransactionInput::parse_from_str(
- "1000:0:D:51EFVNZwpfmTXU7BSLpeh3PZFgfdmm5hq5MzCDopdH2:46496",
- )
- .unwrap(),
- ],
- outputs: &vec![
- TransactionOutput::parse_from_str(
- "1000:0:SIG(2yN8BRSkARcqE8NCxKMBiHfTpx1EvwULFn56Myf6qRmy)",
- )
- .unwrap(),
- ],
+ inputs: &vec![TransactionInput::parse_from_str(
+ "1000:0:D:51EFVNZwpfmTXU7BSLpeh3PZFgfdmm5hq5MzCDopdH2:46496",
+ )
+ .unwrap()],
+ outputs: &vec![TransactionOutput::parse_from_str(
+ "1000:0:SIG(2yN8BRSkARcqE8NCxKMBiHfTpx1EvwULFn56Myf6qRmy)",
+ )
+ .unwrap()],
unlocks: &vec![TransactionInputUnlocks::parse_from_str("0:SIG(0)").unwrap()],
comment: "Merci pour la calligraphie ;) de Liam",
hash: None,
@@ -128,12 +124,10 @@ mod tests {
ed25519::PublicKey::from_base58("FVUFRrk1K5TQGsY7PRLwqHgdHRoHrwb1hcucp4C2N5tD")
.unwrap(),
)],
- inputs: &vec![
- TransactionInput::parse_from_str(
- "1000:0:D:FVUFRrk1K5TQGsY7PRLwqHgdHRoHrwb1hcucp4C2N5tD:1",
- )
- .unwrap(),
- ],
+ inputs: &vec![TransactionInput::parse_from_str(
+ "1000:0:D:FVUFRrk1K5TQGsY7PRLwqHgdHRoHrwb1hcucp4C2N5tD:1",
+ )
+ .unwrap()],
outputs: &vec![
TransactionOutput::parse_from_str(
"3:0:SIG(7vU9BMDhN6fBuRa2iK3JRbC6pqQKb4qDMGsFcQuT5cz)",
diff --git a/ws2p-v1-legacy/parsers/transactions.rs b/ws2p-v1-legacy/parsers/transactions.rs
index 2484034c..ff24ff9e 100644
--- a/ws2p-v1-legacy/parsers/transactions.rs
+++ b/ws2p-v1-legacy/parsers/transactions.rs
@@ -121,18 +121,14 @@ Merci pour la calligraphie ;) de Liam$\
ed25519::PublicKey::from_base58("51EFVNZwpfmTXU7BSLpeh3PZFgfdmm5hq5MzCDopdH2")
.unwrap(),
)],
- inputs: &vec![
- TransactionInput::parse_from_str(
- "1000:0:D:51EFVNZwpfmTXU7BSLpeh3PZFgfdmm5hq5MzCDopdH2:46496",
- )
- .unwrap(),
- ],
- outputs: &vec![
- TransactionOutput::parse_from_str(
- "1000:0:SIG(2yN8BRSkARcqE8NCxKMBiHfTpx1EvwULFn56Myf6qRmy)",
- )
- .unwrap(),
- ],
+ inputs: &vec![TransactionInput::parse_from_str(
+ "1000:0:D:51EFVNZwpfmTXU7BSLpeh3PZFgfdmm5hq5MzCDopdH2:46496",
+ )
+ .unwrap()],
+ outputs: &vec![TransactionOutput::parse_from_str(
+ "1000:0:SIG(2yN8BRSkARcqE8NCxKMBiHfTpx1EvwULFn56Myf6qRmy)",
+ )
+ .unwrap()],
unlocks: &vec![TransactionInputUnlocks::parse_from_str("0:SIG(0)").unwrap()],
comment: "Merci pour la calligraphie ;) de Liam",
hash: None,
diff --git a/ws2p/lib.rs b/ws2p/lib.rs
index cbb708c4..773de02f 100644
--- a/ws2p/lib.rs
+++ b/ws2p/lib.rs
@@ -181,7 +181,7 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2Pv2Module {
_keys: RequiredKeysContent,
_module_conf: Self::ModuleConf,
_subcommand_args: WS2POpt,
- ) -> () {
+ ) {
println!("Succesfully exec ws2p subcommand !")
}
fn start(
--
GitLab