1 files changed, 18 insertions, 18 deletions

diff --git a/src/swarm/peer/keepalive.rs b/src/swarm/peer/keepalive.rs
index ce2951b..810c377 100644
--- a/src/swarm/peer/keepalive.rs
+++ b/src/swarm/peer/keepalive.rs
@@ -1,4 +1,4 @@
-//! Keepalives (PING / PONG) and the self-healing re-handshake when they show our
+//! Keepalives (STATUS / STATUS_REPLY) and the self-healing re-handshake when they show our
 //! documents differ while sync is idle.
 
 use std::sync::atomic::Ordering;
@@ -14,37 +14,37 @@ use crate::swarm::sync::SyncEvent;
 use crate::swarm::topology;
 use crate::transport::{self, ParsedMessage};
 
-/// Sends `peer` a PING with our keepalive, noting the time for its round trip.
-pub(crate) async fn send_ping(state: &AppState, peer: &str) -> Result<()> {
-    let keepalive = local_keepalive(state, peer).await;
-    state.lock_rtt().ping_sent(peer, Instant::now());
+/// Sends `peer` a STATUS with our status, noting the time for its round trip.
+pub(crate) async fn send_status(state: &AppState, peer: &str) -> Result<()> {
+    let status = local_status(state, peer).await;
+    state.lock_rtt().status_sent(peer, Instant::now());
     state
         .transport
-        .send_message(peer, &ParsedMessage::Ping(keepalive))
+        .send_message(peer, &ParsedMessage::Status(status))
         .await
 }
 
-/// How long shutting down waits for the last PINGs (`farewell`).
+/// How long shutting down waits for the last STATUSes (`farewell`).
 const FAREWELL_TIMEOUT: Duration = Duration::from_secs(2);
 
-/// At shutdown: one last PING to each neighbour, saying we aren't ready. A neighbour
+/// At shutdown: one last STATUS to each neighbour, saying we aren't ready. A neighbour
 /// catching up from us picks another source now, instead of once we go dormant. Bounded
 /// in time: our transport may be gone already.
 pub(crate) async fn farewell(state: &AppState) {
     state.stopping.store(true, Ordering::Release);
-    let mut pings = tokio::task::JoinSet::new();
+    let mut statuses = tokio::task::JoinSet::new();
     for (peer, _) in state.peers_snapshot().await {
         if topology::is_neighbour(state, &peer) {
             let state = state.clone();
-            pings.spawn(async move { send_ping(&state, &peer).await });
+            statuses.spawn(async move { send_status(&state, &peer).await });
         }
     }
-    let all_sent = async { while pings.join_next().await.is_some() {} };
+    let all_sent = async { while statuses.join_next().await.is_some() {} };
     let _ = tokio::time::timeout(FAREWELL_TIMEOUT, all_sent).await;
 }
 
-/// Our keepalive for `peer`.
-pub(crate) async fn local_keepalive(state: &AppState, peer: &str) -> transport::Keepalive {
+/// Our status for `peer`.
+pub(crate) async fn local_status(state: &AppState, peer: &str) -> transport::Status {
     // Heads and epoch are published together (`Replica::stamps`), so they always match,
     // and reading them doesn't wait for a sync message being applied.
     let (heads, epoch, epoch_seq) = {
@@ -64,7 +64,7 @@ pub(crate) async fn local_keepalive(state: &AppState, peer: &str) -> transport::
         }
         None => false,
     };
-    transport::Keepalive {
+    transport::Status {
         heads,
         epoch,
         epoch_seq,
@@ -73,8 +73,8 @@ pub(crate) async fn local_keepalive(state: &AppState, peer: &str) -> transport::
     }
 }
 
-/// What a peer's keepalive says about it.
-pub(super) async fn note_keepalive(state: &AppState, peer: &str, remote: &transport::Keepalive) {
+/// What a peer's status says about it.
+pub(super) async fn note_status(state: &AppState, peer: &str, remote: &transport::Status) {
     if let Some(peer_state) = state.get_peer_state(peer).await {
         let mut peer_state = peer_state.lock().await;
         let became_ready = remote.ready && peer_state.reports_ready != Some(true);
@@ -103,8 +103,8 @@ pub(super) async fn note_keepalive(state: &AppState, peer: &str, remote: &transp
 pub(super) async fn heal_if_diverged(
     state: &AppState,
     peer: &str,
-    local: &transport::Keepalive,
-    remote: &transport::Keepalive,
+    local: &transport::Status,
+    remote: &transport::Status,
 ) {
     // Heads of documents from different epochs are never equal and never converge.
     // And a peer that isn't our neighbour isn't ours to keep in step.