Protocol version type safety (#2811)

* add type safety for protocol_version

* cleanup tui for protocol version

* cleanup
This commit is contained in:
Antioch Peverell
2019-05-08 20:51:07 +01:00
committed by GitHub
parent 4ad2ed48a3
commit 8d5f73e8f1
9 changed files with 79 additions and 42 deletions
+2 -2
View File
@@ -74,7 +74,7 @@ pub fn show_status(config: &ServerConfig, api_secret: Option<String>) {
t.reset().unwrap();
match get_status_from_node(config, api_secret) {
Ok(status) => {
writeln!(e, "Protocol version: {}", status.protocol_version).unwrap();
writeln!(e, "Protocol version: {:?}", status.protocol_version).unwrap();
writeln!(e, "User agent: {}", status.user_agent).unwrap();
writeln!(e, "Connections: {}", status.connections).unwrap();
writeln!(e, "Chain height: {}", status.tip.height).unwrap();
@@ -139,7 +139,7 @@ pub fn list_connected_peers(config: &ServerConfig, api_secret: Option<String>) {
writeln!(e, "Peer {}:", index).unwrap();
writeln!(e, "Capabilities: {:?}", connected_peer.capabilities).unwrap();
writeln!(e, "User agent: {}", connected_peer.user_agent).unwrap();
writeln!(e, "Version: {}", connected_peer.version).unwrap();
writeln!(e, "Version: {:?}", connected_peer.version).unwrap();
writeln!(e, "Peer address: {}", connected_peer.addr).unwrap();
writeln!(e, "Height: {}", connected_peer.height).unwrap();
writeln!(e, "Total difficulty: {}", connected_peer.total_difficulty).unwrap();
+2 -2
View File
@@ -81,7 +81,7 @@ impl TableViewItem<PeerColumn> for PeerStats {
)
.to_string(),
PeerColumn::Direction => self.direction.clone(),
PeerColumn::Version => self.version.to_string(),
PeerColumn::Version => format!("{}", self.version),
PeerColumn::UserAgent => self.user_agent.clone(),
}
}
@@ -129,7 +129,7 @@ impl TUIStatusListener for TUIPeerView {
.column(PeerColumn::TotalDifficulty, "Total Difficulty", |c| {
c.width_percent(24)
})
.column(PeerColumn::Version, "Ver", |c| c.width_percent(6))
.column(PeerColumn::Version, "Proto", |c| c.width_percent(6))
.column(PeerColumn::UserAgent, "User Agent", |c| c.width_percent(18));
let peer_status_view = BoxView::with_full_screen(
LinearLayout::new(Orientation::Vertical)
+1 -1
View File
@@ -85,7 +85,7 @@ impl UI {
let mut title_string = StyledString::new();
title_string.append(StyledString::styled(
format!(
"Grin Version {} (protocol version: {})",
"Grin Version {} (proto: {})",
built_info::PKG_VERSION,
Server::protocol_version()
),