From b2b4f5bb894b3c3feb9759c99134c83e2f9b1ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Thu, 7 May 2020 19:42:15 +0200
Subject: [PATCH] aquatic_ws: add some serde attributes on protocol data types

---
 TODO.md                        | 4 +---
 aquatic_ws/src/lib/protocol.rs | 8 +++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/TODO.md b/TODO.md
index 7f2bb09..3471eeb 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,10 +1,8 @@
 # TODO
 
 ## aquatic_ws
-* serde
-    * AnnonunceWrapper or ActionWrapper or the like with an action field
-      and serde flatten on inner message
 * handler
+* test
 
 ## aquatic
 * mio: set oneshot for epoll and kqueue? otherwise, stop reregistering?
diff --git a/aquatic_ws/src/lib/protocol.rs b/aquatic_ws/src/lib/protocol.rs
index 3620262..54027eb 100644
--- a/aquatic_ws/src/lib/protocol.rs
+++ b/aquatic_ws/src/lib/protocol.rs
@@ -22,6 +22,7 @@ pub struct ResponsePeer {
 
 
 #[derive(Clone, Deserialize)]
+#[serde(rename_all = "lowercase")]
 pub enum AnnounceEvent {
     Started,
     Stopped,
@@ -73,7 +74,9 @@ pub struct AnnounceRequestOffer {
 pub struct AnnounceRequest {
     pub info_hash: InfoHash, // FIXME: I think these are actually really just strings with 20 len, same with peer id
     pub peer_id: PeerId,
+    #[serde(rename = "left")]
     pub bytes_left: bool, // Just called "left" in protocol
+    #[serde(default)]
     pub event: AnnounceEvent, // Can be empty? Then, default is "update"
 
     // Length of this is number of peers wanted?
@@ -82,6 +85,7 @@ pub struct AnnounceRequest {
 
     /// If false, send response before sending offers (or possibly "skip sending update back"?)
     /// If true, send MiddlemanAnswerToPeer to peer with "to_peer_id" as peer_id.
+    #[serde(default)]
     pub answer: bool, 
     pub to_peer_id: Option<PeerId>, // Only parsed to hex if answer == true, probably undefined otherwise
 }
@@ -95,7 +99,8 @@ pub struct AnnounceResponse {
     // I suspect receivers don't care about this and rely on offers instead??
     // Also, what does it contain, exacly (not certain that it is ResponsePeer?)
     pub peers: Vec<ResponsePeer>,
-    pub interval: usize, // Default 2 min probably
+    #[serde(rename = "interval")]
+    pub announce_interval: usize, // Default 2 min probably
 
     // Sent to "to_peer_id" peer (?? or did I put this into MiddlemanAnswerToPeer instead?)
     // pub offer_id: (),
@@ -128,6 +133,7 @@ pub struct ScrapeResponse {
 
 
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
 pub enum Action {
     Announce,
     Scrape