rename PING/PONG to STATUS/STATUS_REPLY

1 files changed, 19 insertions, 18 deletions

diff --git a/src/transport/wire.rs b/src/transport/wire.rs
index 5577f42..62aa3ca 100644
--- a/src/transport/wire.rs
+++ b/src/transport/wire.rs
@@ -22,8 +22,8 @@ fn tag(kind: MessageKind) -> u8 {
         MessageKind::Hello => 0,
         MessageKind::HelloReply => 1,
         MessageKind::Sync => 2,
-        MessageKind::Ping => 3,
-        MessageKind::Pong => 4,
+        MessageKind::Status => 3,
+        MessageKind::StatusReply => 4,
         MessageKind::Blob => 5,
         MessageKind::Who => 6,
         MessageKind::Me => 7,
@@ -55,8 +55,8 @@ pub(crate) fn encode(message: &ParsedMessage) -> Result<Vec<u8>, WireError> {
         ParsedMessage::Hello(hello) => rmp_serde::encode::write(&mut payload, hello)?,
         ParsedMessage::HelloReply(reply) => rmp_serde::encode::write(&mut payload, reply)?,
         ParsedMessage::Sync(envelope) => rmp_serde::encode::write(&mut payload, envelope)?,
-        ParsedMessage::Ping(keepalive) | ParsedMessage::Pong(keepalive) => {
-            rmp_serde::encode::write(&mut payload, keepalive)?
+        ParsedMessage::Status(status) | ParsedMessage::StatusReply(status) => {
+            rmp_serde::encode::write(&mut payload, status)?
         }
         ParsedMessage::Blob(blob) => rmp_serde::encode::write(&mut payload, blob)?,
         ParsedMessage::Who(proof) | ParsedMessage::Me(proof) => {
@@ -80,10 +80,10 @@ pub(crate) fn decode(payload: &[u8]) -> Result<ParsedMessage, WireError> {
         ParsedMessage::HelloReply(rmp_serde::from_slice(body)?)
     } else if is(MessageKind::Sync) {
         ParsedMessage::Sync(rmp_serde::from_slice(body)?)
-    } else if is(MessageKind::Ping) {
-        ParsedMessage::Ping(rmp_serde::from_slice(body)?)
-    } else if is(MessageKind::Pong) {
-        ParsedMessage::Pong(rmp_serde::from_slice(body)?)
+    } else if is(MessageKind::Status) {
+        ParsedMessage::Status(rmp_serde::from_slice(body)?)
+    } else if is(MessageKind::StatusReply) {
+        ParsedMessage::StatusReply(rmp_serde::from_slice(body)?)
     } else if is(MessageKind::Blob) {
         ParsedMessage::Blob(rmp_serde::from_slice(body)?)
     } else if is(MessageKind::Who) {
@@ -322,7 +322,7 @@ mod tests {
     use crate::document::replica::Epoch;
     use crate::transport::{
         BlobBody, BlobId, BlobMessage, HeadsSummary, HelloReply, HelloRequest, IdentityProof,
-        Keepalive, ListedPeer, MAX_LISTED_HEADS,
+        ListedPeer, MAX_LISTED_HEADS, Status,
     };
     use automerge::ChangeHash;
 
@@ -380,7 +380,7 @@ mod tests {
 
     #[test]
     fn keepalives_keep_their_kind_and_heads() {
-        let keepalive = Keepalive {
+        let status = Status {
             heads: HeadsSummary::Digest {
                 digest: [8; 32],
                 sample: vec![ChangeHash([9; 32])],
@@ -390,17 +390,18 @@ mod tests {
             ready: true,
             syncs_with_you: false,
         };
-        let decoded = decode(&encode(&ParsedMessage::Pong(keepalive.clone())).unwrap()).unwrap();
-        let ParsedMessage::Pong(decoded) = decoded else {
-            panic!("not a PONG");
+        let decoded =
+            decode(&encode(&ParsedMessage::StatusReply(status.clone())).unwrap()).unwrap();
+        let ParsedMessage::StatusReply(decoded) = decoded else {
+            panic!("not a STATUS_REPLY");
         };
-        assert_eq!(decoded.heads, keepalive.heads);
+        assert_eq!(decoded.heads, status.heads);
         assert_eq!(decoded.heads.listed(), [ChangeHash([9; 32])]);
     }
 
     #[test]
     fn too_many_listed_heads_are_refused() {
-        let keepalive = Keepalive {
+        let status = Status {
             heads: HeadsSummary::Heads(
                 (0..=MAX_LISTED_HEADS as u8)
                     .map(|n| ChangeHash([n; 32]))
@@ -411,7 +412,7 @@ mod tests {
             ready: true,
             syncs_with_you: true,
         };
-        assert!(decode(&encode(&ParsedMessage::Ping(keepalive)).unwrap()).is_err());
+        assert!(decode(&encode(&ParsedMessage::Status(status)).unwrap()).is_err());
     }
 
     #[test]
@@ -495,7 +496,7 @@ mod tests {
             )
         );
 
-        let ping = ParsedMessage::Ping(Keepalive {
+        let status = ParsedMessage::Status(Status {
             heads: HeadsSummary::Heads(Vec::new()),
             epoch,
             epoch_seq: 1,
@@ -503,7 +504,7 @@ mod tests {
             syncs_with_you: false,
         });
         assert_eq!(
-            hex(&encode(&ping).unwrap()),
+            hex(&encode(&status).unwrap()),
             format!("0503959290c400{epoch_hex}01c3c2")
         );