blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

`solana gossip` now includes feature set information

This commit is contained in:
Michael Vines 2022-02-24 13:36:50 -08:00
parent 5e0086c1ee
commit 7111918596
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli-output/src/cli_output.rs
View File

@ -2451,6 +2451,8 @@ pub struct CliGossipNode {
pub rpc_host: Option<String>, pub rpc_host: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub version: Option<String>, pub version: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub feature_set: Option<u32>,
} }
impl CliGossipNode { impl CliGossipNode {
@ -2463,6 +2465,7 @@ impl CliGossipNode {
tpu_port: info.tpu.map(|addr| addr.port()), tpu_port: info.tpu.map(|addr| addr.port()),
rpc_host: info.rpc.map(|addr| addr.to_string()), rpc_host: info.rpc.map(|addr| addr.to_string()),
version: info.version, version: info.version,
feature_set: info.feature_set,
} }
} }
} }
@ -2488,7 +2491,7 @@ impl fmt::Display for CliGossipNode {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!( write!(
f, f,
"{:15} | {:44} | {:6} | {:5} | {:21} | {}", "{:15} | {:44} | {:6} | {:5} | {:21} | {:8}| {}",
unwrap_to_string_or_none(self.ip_address.as_ref()), unwrap_to_string_or_none(self.ip_address.as_ref()),
self.identity_label self.identity_label
.as_ref() .as_ref()
@ -2497,6 +2500,7 @@ impl fmt::Display for CliGossipNode {
unwrap_to_string_or_none(self.tpu_port.as_ref()), unwrap_to_string_or_none(self.tpu_port.as_ref()),
unwrap_to_string_or_none(self.rpc_host.as_ref()), unwrap_to_string_or_none(self.rpc_host.as_ref()),
unwrap_to_string_or_default(self.version.as_ref(), "unknown"), unwrap_to_string_or_default(self.version.as_ref(), "unknown"),
unwrap_to_string_or_default(self.feature_set.as_ref(), "unknown"),
) )
} }
} }
@ -2511,10 +2515,10 @@ impl fmt::Display for CliGossipNodes {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
writeln!( writeln!(
f, f,
"IP Address | Node identifier \ "IP Address | Identity \
| Gossip | TPU | RPC Address | Version\n\ | Gossip | TPU | RPC Address | Version | Feature Set\n\
----------------+----------------------------------------------+\ ----------------+----------------------------------------------+\
--------+-------+-----------------------+----------------", --------+-------+-----------------------+---------+----------------",
)?; )?;
for node in self.0.iter() { for node in self.0.iter() {
writeln!(f, "{}", node)?; writeln!(f, "{}", node)?;