feat(rpc): update getpeerinfo to include RTT from MetaAddr

Author: syszery

zebra-network/src/address_book_peers/mock.rs

@@ -7,30 +7,27 @@ use std::{
 
 use crate::{meta_addr::MetaAddr, AddressBookPeers, PeerSocketAddr};
 
-const DEFAULT_RTT: Duration = Duration::from_millis(100);
-
 /// A mock [`AddressBookPeers`] implementation that's always empty.
 #[derive(Debug, Default, Clone)]
 pub struct MockAddressBookPeers {
     /// Return value for mock `recently_live_peers` method.
     recently_live_peers: Vec<MetaAddr>,
-    default_rtt: Duration,
 }
 
 impl MockAddressBookPeers {
     /// Creates a new [`MockAddressBookPeers`]
     pub fn new(recently_live_peers: Vec<MetaAddr>) -> Self {
         Self {
             recently_live_peers,
-            default_rtt: DEFAULT_RTT,
         }
     }
 
     /// Adds a peer to the mock address book.
     pub fn add_peer(&mut self, peer: PeerSocketAddr) -> bool {
         // The real add peer will use `MetaAddr::new_initial_peer` but we just want to get a `MetaAddr` for the mock.
+        let rtt = Duration::from_millis(100);
         self.recently_live_peers.push(
-            MetaAddr::new_responded(peer, self.default_rtt).into_new_meta_addr(
+            MetaAddr::new_responded(peer, rtt).into_new_meta_addr(
                 Instant::now(),
                 chrono::Utc::now()
                     .try_into()

zebra-network/src/meta_addr.rs

@@ -192,8 +192,7 @@ pub struct MetaAddr {
     /// The last measured round-trip time (RTT) for this peer, if available.
     ///
     /// This value is updated when the peer responds to a ping (Pong).
-    #[allow(dead_code)]
-    pub(crate) rtt: Option<Duration>,
+    rtt: Option<Duration>,
 
     /// The last time we tried to open an outbound connection to this peer.
     ///
@@ -459,6 +458,13 @@ impl MetaAddr {
         self.is_inbound
     }
 
+    /// Returns the round-trip time (RTT) for this peer, if available,
+    /// as the number of seconds (f64). This value is updated when the peer
+    /// responds to a ping (Pong).
+    pub fn rtt(&self) -> Option<f64> {
+        self.rtt.map(|duration| duration.as_secs_f64())
+    }
+
     /// Returns the unverified "last seen time" gossiped by the remote peer that
     /// sent us this address.
     ///

zebra-rpc/src/methods/tests/vectors.rs

@@ -2940,7 +2940,8 @@ async fn rpc_addnode() {
         [PeerInfo {
             addr,
             inbound: false,
-            pingtime: None,
+            // TODO: Fix this when mock address book provides other values
+            pingtime: Some(0.1f64),
             pingwait: None,
         }]
     );

zebra-rpc/src/methods/types/peer_info.rs

@@ -32,7 +32,7 @@ impl From<MetaAddr> for PeerInfo {
             addr: meta_addr.addr(),
             inbound: meta_addr.is_inbound(),
             // TODO: Fill in pingtime and pingwait once live ping tracking is implemented.
-            pingtime: None,
+            pingtime: meta_addr.rtt(),
             pingwait: None,
         }
     }