Remove RwLock around individual peer instances (#1673)
* get rid of RwLock around peer instances * rustfmt * rename stuff to live_info * rustfmt * serialize into PeerInfoDisplay limit live_info write lock to peer_info.update() rename to PeerLiveInfo * simplify broadcast logic a bit more connected peers are connected by definition * return true/false on broadcast so we can send to more peers * rustfmt * fix p2p and server tests for PeerInfoDisplay * commit
This commit is contained in:
@@ -122,8 +122,9 @@ pub fn unban_peer(config: &ServerConfig, peer_addr: &SocketAddr, api_secret: Opt
|
||||
pub fn list_connected_peers(config: &ServerConfig, api_secret: Option<String>) {
|
||||
let mut e = term::stdout().unwrap();
|
||||
let url = format!("http://{}/v1/peers/connected", config.api_http_addr);
|
||||
let peers_info: Result<Vec<p2p::PeerInfo>, api::Error>;
|
||||
peers_info = api::client::get::<Vec<p2p::PeerInfo>>(url.as_str(), api_secret);
|
||||
// let peers_info: Result<Vec<p2p::PeerInfoDisplay>, api::Error>;
|
||||
|
||||
let peers_info = api::client::get::<Vec<p2p::types::PeerInfoDisplay>>(url.as_str(), api_secret);
|
||||
|
||||
match peers_info.map_err(|e| Error::API(e)) {
|
||||
Ok(connected_peers) => {
|
||||
@@ -134,6 +135,7 @@ pub fn list_connected_peers(config: &ServerConfig, api_secret: Option<String>) {
|
||||
writeln!(e, "User agent: {}", connected_peer.user_agent).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();
|
||||
writeln!(e, "Direction: {:?}", connected_peer.direction).unwrap();
|
||||
println!();
|
||||
@@ -142,6 +144,7 @@ pub fn list_connected_peers(config: &ServerConfig, api_secret: Option<String>) {
|
||||
}
|
||||
Err(_) => writeln!(e, "Failed to get connected peers").unwrap(),
|
||||
};
|
||||
|
||||
e.reset().unwrap();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user