fix relay stats

tari-project · Nov 8, 2024 · c78fac2 · c78fac2
1 parent f9087a8
commit c78fac2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/applications/minotari_node/src/commands/command/status.rs b/applications/minotari_node/src/commands/command/status.rs
@@ -149,11 +149,8 @@ impl CommandContext {
             },
         }
 
-        if relay_stats.num_active_relay_reservations > 0 || relay_stats.num_active_circuits > 0 {
-            status_line.add("relay");
-        }
-        if relay_stats.num_active_relay_reservations > 0 {
-            status_line.add_field("rsrv", relay_stats.num_active_relay_reservations.to_string());
+        if !relay_stats.active_relay_reservations.is_empty() {
+            status_line.add_field("rsrv", relay_stats.active_relay_reservations.len().to_string());
         }
         if relay_stats.num_active_circuits > 0 {
             status_line.add_field("circ", relay_stats.num_active_circuits.to_string());

diff --git a/network/core/src/relay_state.rs b/network/core/src/relay_state.rs
@@ -106,9 +106,9 @@ pub(crate) struct RelayPeer {
     pub remote_address: Option<Multiaddr>,
 }
 
-#[derive(Debug, Clone, Copy, Default)]
+#[derive(Debug, Clone, Default)]
 pub struct RelayStats {
-    pub num_active_relay_reservations: usize,
+    pub active_relay_reservations: HashSet<PeerId>,
     pub num_active_circuits: usize,
     pub current_relay_peer: Option<PeerId>,
 }
diff --git a/network/core/src/worker.rs b/network/core/src/worker.rs
@@ -546,7 +546,7 @@ where
                 let _ignore = reply.send(Ok(self.seed_peers.clone()));
             },
             NetworkingRequest::GetRelayStats { reply } => {
-                let _ignore = reply.send(Ok(self.relay_stats));
+                let _ignore = reply.send(Ok(self.relay_stats.clone()));
             },
         }
     }
@@ -715,6 +715,7 @@ where
                 if self.relay_stats.current_relay_peer == Some(peer_id) {
                     self.relay_stats.current_relay_peer = None;
                 }
+                self.relay_stats.active_relay_reservations.remove(&peer_id);
 
                 self.publish_event(NetworkEvent::PeerDisconnected { peer_id });
             },
@@ -1201,14 +1202,9 @@ where
         #[allow(clippy::enum_glob_use)]
         use relay::Event::*;
         match event {
-            ReservationReqAccepted { .. } => {
-                self.relay_stats.num_active_relay_reservations += 1;
+            ReservationReqAccepted { src_peer_id, .. } => {
+                self.relay_stats.active_relay_reservations.insert(*src_peer_id);
             },
-            ReservationReqDenied { .. } => {},
-            ReservationTimedOut { .. } => {
-                self.relay_stats.num_active_relay_reservations -= 1;
-            },
-            CircuitReqDenied { .. } => {},
             CircuitReqAccepted { .. } => {
                 self.relay_stats.num_active_circuits += 1;
             },