From 3efe382e9c1a4fadc4131b64b6de8c9a7179d1e7 Mon Sep 17 00:00:00 2001
From: Antioch Peverell <apeverell@protonmail.com>
Date: Wed, 25 Nov 2020 16:29:33 +0000
Subject: [PATCH] add peer capabilities to tui peers screen (#3490)

---
 servers/src/common/stats.rs |  4 ++++
 src/bin/tui/peers.rs        | 10 +++++++++-
 src/bin/tui/table.rs        |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/servers/src/common/stats.rs b/servers/src/common/stats.rs
index cb5faa208..f986edce3 100644
--- a/servers/src/common/stats.rs
+++ b/servers/src/common/stats.rs
@@ -26,6 +26,7 @@ use chrono::prelude::*;
 
 use crate::chain::SyncStatus;
 use crate::p2p;
+use crate::p2p::Capabilities;
 use grin_core::pow::Difficulty;
 
 /// Server state info collection struct, to be passed around into internals
@@ -192,6 +193,8 @@ pub struct PeerStats {
 	pub sent_bytes_per_sec: u64,
 	/// Number of bytes we've received from the peer.
 	pub received_bytes_per_sec: u64,
+	/// Peer advertised capability flags.
+	pub capabilities: Capabilities,
 }
 
 impl PartialEq for PeerStats {
@@ -239,6 +242,7 @@ impl PeerStats {
 			last_seen: peer.info.last_seen(),
 			sent_bytes_per_sec: peer.last_min_sent_bytes().unwrap_or(0) / 60,
 			received_bytes_per_sec: peer.last_min_received_bytes().unwrap_or(0) / 60,
+			capabilities: peer.info.capabilities,
 		}
 	}
 }
diff --git a/src/bin/tui/peers.rs b/src/bin/tui/peers.rs
index 293b87112..964862229 100644
--- a/src/bin/tui/peers.rs
+++ b/src/bin/tui/peers.rs
@@ -41,6 +41,7 @@ pub enum PeerColumn {
 	Direction,
 	Version,
 	UserAgent,
+	Capabilities,
 }
 
 impl PeerColumn {
@@ -53,6 +54,7 @@ impl PeerColumn {
 			PeerColumn::TotalDifficulty => "Total Difficulty",
 			PeerColumn::Direction => "Direction",
 			PeerColumn::UserAgent => "User Agent",
+			PeerColumn::Capabilities => "Capabilities",
 		}
 	}
 }
@@ -82,6 +84,7 @@ impl TableViewItem<PeerColumn> for PeerStats {
 			PeerColumn::Direction => self.direction.clone(),
 			PeerColumn::Version => format!("{}", self.version),
 			PeerColumn::UserAgent => self.user_agent.clone(),
+			PeerColumn::Capabilities => format!("{}", self.capabilities.bits()),
 		}
 	}
 
@@ -115,6 +118,10 @@ impl TableViewItem<PeerColumn> for PeerStats {
 			PeerColumn::Direction => self.direction.cmp(&other.direction).then(sort_by_addr()),
 			PeerColumn::Version => self.version.cmp(&other.version).then(sort_by_addr()),
 			PeerColumn::UserAgent => self.user_agent.cmp(&other.user_agent).then(sort_by_addr()),
+			PeerColumn::Capabilities => self
+				.capabilities
+				.cmp(&other.capabilities)
+				.then(sort_by_addr()),
 		}
 	}
 }
@@ -133,7 +140,8 @@ impl TUIPeerView {
 			.column(PeerColumn::TotalDifficulty, "Total Difficulty", |c| {
 				c.width_percent(24)
 			})
-			.column(PeerColumn::Version, "Proto", |c| c.width_percent(6))
+			.column(PeerColumn::Version, "Proto", |c| c.width_percent(4))
+			.column(PeerColumn::Capabilities, "Capab", |c| c.width_percent(4))
 			.column(PeerColumn::UserAgent, "User Agent", |c| c.width_percent(18));
 		let peer_status_view = ResizedView::with_full_screen(
 			LinearLayout::new(Orientation::Vertical)
diff --git a/src/bin/tui/table.rs b/src/bin/tui/table.rs
index b61979295..0fb110ee1 100644
--- a/src/bin/tui/table.rs
+++ b/src/bin/tui/table.rs
@@ -995,6 +995,7 @@ impl<H: Copy + Clone + 'static> TableColumn<H> {
 
 #[cfg(test)]
 mod test {
+	use crate::p2p::Capabilities;
 	use crate::tui::peers::PeerColumn;
 	use crate::tui::table::TableView;
 	use chrono::Utc;
@@ -1060,6 +1061,7 @@ mod test {
 				last_seen: Utc::now(),
 				sent_bytes_per_sec: 0,
 				received_bytes_per_sec: 0,
+				capabilities: Capabilities::FULL_NODE,
 			}
 		}
 	}