diff --git a/lib/dubp/common-doc/src/blockstamp.rs b/lib/dubp/common-doc/src/blockstamp.rs
index c9648f5de154c1800887d4fed3027ce53f2b245d..a1f87b1538d49774e4279e608601f2e68089f8d2 100644
--- a/lib/dubp/common-doc/src/blockstamp.rs
+++ b/lib/dubp/common-doc/src/blockstamp.rs
@@ -167,19 +167,14 @@ impl Blockstamp {
let id = split.next().unwrap().parse::<u32>();
let hash = Hash::from_hex(split.next().unwrap())?;
- if id.is_err() {
- Err(BlockstampParseError::InvalidBlockNumber())
- } else {
+ if let Ok(id) = id {
Ok(Blockstamp {
- id: BlockNumber(id.unwrap()),
+ id: BlockNumber(id),
hash: BlockHash(hash),
})
+ } else {
+ Err(BlockstampParseError::InvalidBlockNumber())
}
}
}
-
- /// Convert a `BlockUId` to its text format.
- pub fn to_string(&self) -> String {
- format!("{}", self)
- }
}
diff --git a/lib/dubp/user-docs/src/parsers/transactions.rs b/lib/dubp/user-docs/src/parsers/transactions.rs
index 7d6f5e714a08bfa6738122e43f648dfd176c29ca..6902f5d3dd5f2685e3a7a24682e6e3f5911a3903 100644
--- a/lib/dubp/user-docs/src/parsers/transactions.rs
+++ b/lib/dubp/user-docs/src/parsers/transactions.rs
@@ -165,5 +165,4 @@ mod tests {
parse_json_transaction(&tx_json_value).expect("Fail to parse tx_json_value !")
);
}
-
}
diff --git a/lib/dunp/network-documents/src/network_endpoint.rs b/lib/dunp/network-documents/src/network_endpoint.rs
index e7a512fa5cec6d009b3ed3c39128ff287fc59d0b..b2d00327925fe40a5f88f87dd2e12929ebf5f29a 100644
--- a/lib/dunp/network-documents/src/network_endpoint.rs
+++ b/lib/dunp/network-documents/src/network_endpoint.rs
@@ -36,6 +36,21 @@ pub static MAX_API_FEATURES_COUNT: &usize = &2040;
/// ApiFeatures
pub struct ApiFeatures(pub Vec<u8>);
+impl Display for ApiFeatures {
+ fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+ if self.is_empty() {
+ write!(f, "")
+ } else {
+ let hex_str = hex::encode(self.0.clone());
+ if hex_str.len() == 2 {
+ write!(f, "0x{} ", &hex_str[1..])
+ } else {
+ write!(f, "0x{} ", hex_str)
+ }
+ }
+ }
+}
+
impl ApiFeatures {
fn is_empty(&self) -> bool {
for byte in &self.0 {
@@ -45,19 +60,6 @@ impl ApiFeatures {
}
true
}
-
- fn to_string(&self) -> String {
- if self.is_empty() {
- String::from("")
- } else {
- let hex_str = hex::encode(self.0.clone());
- if hex_str.len() == 2 {
- format!("0x{} ", &hex_str[1..])
- } else {
- format!("0x{} ", hex_str)
- }
- }
- }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
diff --git a/lib/dunp/network-documents/src/network_head_v2.rs b/lib/dunp/network-documents/src/network_head_v2.rs
index 3cfcdd738222f9b8c4497b5d5ce67c31c9c07014..422babc7d0e970248f02ab485ed0b9826a10e619 100644
--- a/lib/dunp/network-documents/src/network_head_v2.rs
+++ b/lib/dunp/network-documents/src/network_head_v2.rs
@@ -68,20 +68,20 @@ impl NetworkHeadMessageV2 {
pub fn to_human_string(&self, max_len: usize, uid: Option<String>) -> String {
let short_api = &self.api[4..];
- if max_len > 85 && uid.is_some() {
+ if max_len > 85 {
format!(
- "{node_id:8}-{pubkey:.8} {blockstamp:.16} {soft:9}:{ver:14} {pre:3} [{api:5}] {mer:02}:{mir:02} {uid}",
- node_id = self.node_uuid.to_string(),
- pubkey = self.pubkey.to_string(),
- blockstamp = self.blockstamp.to_string(),
- soft = self.software,
- ver = self.soft_version,
- pre = self.prefix,
- api = short_api,
- mer = self.free_member_room.unwrap_or(0),
- mir = self.free_mirror_room.unwrap_or(0),
- uid = uid.unwrap(),
- )
+ "{node_id:8}-{pubkey:.8} {blockstamp:.16} {soft:9}:{ver:14} {pre:3} [{api:5}] {mer:02}:{mir:02} {uid}",
+ node_id = self.node_uuid.to_string(),
+ pubkey = self.pubkey.to_string(),
+ blockstamp = self.blockstamp.to_string(),
+ soft = self.software,
+ ver = self.soft_version,
+ pre = self.prefix,
+ api = short_api,
+ mer = self.free_member_room.unwrap_or(0),
+ mir = self.free_mirror_room.unwrap_or(0),
+ uid = uid.unwrap_or_default(),
+ )
} else if max_len > 75 {
format!(
"{node_id:8}-{pubkey:.8} {blockstamp:.16} {soft:9}:{ver:14} {pre:3} [{api:5}] {mer:02}:{mir:02}",
diff --git a/lib/dunp/network-documents/src/network_peer.rs b/lib/dunp/network-documents/src/network_peer.rs
index f4fd7deab8ebc755a16791fa23f93ccb51aaa7ca..c125d4266a141db022f72321d7d9b49c0247a40d 100644
--- a/lib/dunp/network-documents/src/network_peer.rs
+++ b/lib/dunp/network-documents/src/network_peer.rs
@@ -76,7 +76,8 @@ impl PeerCardV11 {
))
}
Rule::block_id => {
- created_on = Some(BlockNumber(field.as_str().parse().unwrap())); // Grammar ensures that we have a digits string.
+ created_on = Some(BlockNumber(field.as_str().parse().unwrap()));
+ // Grammar ensures that we have a digits string.
}
Rule::endpoint_v2 => endpoints.push(EndpointV2::from_pest_pair(field)?),
Rule::ed25519_sig => {
diff --git a/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs b/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs
index 87b1cb148cfb6ae8657a88585387041653bb0ee1..c8e3b9b6959d4ed8aa066edecf2425e850a1223e 100644
--- a/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs
+++ b/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs
@@ -778,5 +778,4 @@ mod tests {
// Check that the root of the tree has shifted
assert_eq!(Some(TreeNodeId(1)), tree.get_root_id());
}
-
}
diff --git a/lib/tools/json-pest-parser/src/lib.rs b/lib/tools/json-pest-parser/src/lib.rs
index 05ae3c23a8a53bea233da0c15ac19fc7c078b21f..8ac74e245baf72953ab9bcff6406a7090c19d245 100644
--- a/lib/tools/json-pest-parser/src/lib.rs
+++ b/lib/tools/json-pest-parser/src/lib.rs
@@ -483,5 +483,4 @@ mod tests {
.expect("friends field must be an array of String")
);
}
-
}
diff --git a/lib/tools/pkstl/src/minimal.rs b/lib/tools/pkstl/src/minimal.rs
index 69fb34e6fe3906b4fb3e520050e92bbff26415f0..996493aba0deb93354d85bb3203ccb7f5499cd33 100644
--- a/lib/tools/pkstl/src/minimal.rs
+++ b/lib/tools/pkstl/src/minimal.rs
@@ -630,5 +630,4 @@ mod tests {
panic!();
}
}
-
}