From 4a02c7863e824495b153dcb36aae3f7bf130b0df Mon Sep 17 00:00:00 2001 From: librelois <elois@ifee.fr> Date: Thu, 21 Jun 2018 01:24:15 +0200 Subject: [PATCH] [fix] double the size of soft_version field --- network/network_head.rs | 12 ++++++------ tui/lib.rs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/network/network_head.rs b/network/network_head.rs index efd2dad5..91bf2843 100644 --- a/network/network_head.rs +++ b/network/network_head.rs @@ -68,9 +68,9 @@ impl NetworkHeadMessageV2 { pub fn to_human_string(&self, max_len: usize, uid: Option<String>) -> String { let short_api = &self.api[4..]; - if max_len > 80 && uid.is_some() { + if max_len > 85 && uid.is_some() { format!( - "{node_id:8}-{pubkey:.8} {blockstamp:.16} {soft:7}:{ver:7} {pre:3} [{api:5}] {mer:02}:{mir:02} {uid}", + "{node_id:8}-{pubkey:.8} {blockstamp:.16} {soft:7}:{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(), @@ -82,9 +82,9 @@ impl NetworkHeadMessageV2 { mir = self.free_mirror_room.unwrap_or(0), uid = uid.unwrap(), ) - } else if max_len > 67 { + } else if max_len > 75 { format!( - "{node_id:8}-{pubkey:.8} {blockstamp:.16} {soft:7}:{ver:7} {pre:3} [{api:5}] {mer:02}:{mir:02}", + "{node_id:8}-{pubkey:.8} {blockstamp:.16} {soft:7}:{ver:14} {pre:3} [{api:5}] {mer:02}:{mir:02}", node_id = self.node_uuid.to_string(), pubkey = self.pubkey.to_string(), blockstamp = self.blockstamp.to_string(), @@ -95,9 +95,9 @@ impl NetworkHeadMessageV2 { mer = self.free_member_room.unwrap_or(0), mir = self.free_mirror_room.unwrap_or(0), ) - } else if max_len > 63 { + } else if max_len > 70 { format!( - "{node_id:8}-{pubkey:.8} {blockstamp:.16} {soft:7}:{ver:7} [{api:5}] {mer:02}:{mir:02}", + "{node_id:8}-{pubkey:.8} {blockstamp:.16} {soft:7}:{ver:14} [{api:5}] {mer:02}:{mir:02}", node_id = self.node_uuid.to_string(), pubkey = self.pubkey.to_string(), blockstamp = self.blockstamp.to_string(), diff --git a/tui/lib.rs b/tui/lib.rs index 3e877a8a..022a796f 100644 --- a/tui/lib.rs +++ b/tui/lib.rs @@ -259,7 +259,7 @@ impl TuiModuleDatas { line += 1; write!( stdout, - "{}{}Step NodeId-Pubkey BlockId-BlockHash Soft:Ver Pre [ Api ] MeR:MiR uid", + "{}{}Step NodeId-Pubkey BlockId-BlockHash Soft:Ver Pre [ Api ] MeR:MiR uid", cursor::Goto(1, line), color::Fg(color::White) ).unwrap(); -- GitLab