From 9f8f80a17bde1891b840f5f51b6c34b4a59ab025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Mon, 4 Apr 2022 12:16:13 +0200
Subject: [PATCH] http protocol: remove AnnounceRequest::compact, fail parsing
 if set to 0

---
 TODO.md                              | 3 ---
 aquatic_http_load_test/src/utils.rs  | 1 -
 aquatic_http_protocol/src/request.rs | 7 -------
 3 files changed, 11 deletions(-)

diff --git a/TODO.md b/TODO.md
index aa6de05..a4e62ec 100644
--- a/TODO.md
+++ b/TODO.md
@@ -8,9 +8,6 @@
     * test ip format
   * site will likely want num_seeders and num_leechers for all torrents..
 
-* aquatic_http_protocol
-  * don't require compact=1?
-
 ## Medium priority
 
 * Use thin LTO?
diff --git a/aquatic_http_load_test/src/utils.rs b/aquatic_http_load_test/src/utils.rs
index bf4c341..c6d9e54 100644
--- a/aquatic_http_load_test/src/utils.rs
+++ b/aquatic_http_load_test/src/utils.rs
@@ -46,7 +46,6 @@ fn create_announce_request(config: &Config, state: &LoadTestState, rng: &mut imp
         event,
         key: None,
         numwant: None,
-        compact: true,
         port: rng.gen(),
         bytes_uploaded: 0,
         bytes_downloaded: 0,
diff --git a/aquatic_http_protocol/src/request.rs b/aquatic_http_protocol/src/request.rs
index 1566b0a..22fe7ed 100644
--- a/aquatic_http_protocol/src/request.rs
+++ b/aquatic_http_protocol/src/request.rs
@@ -15,7 +15,6 @@ pub struct AnnounceRequest {
     pub bytes_downloaded: usize,
     pub bytes_left: usize,
     pub event: AnnounceEvent,
-    pub compact: bool,
     /// Number of response peers wanted
     pub numwant: Option<usize>,
     pub key: Option<SmartString<LazyCompact>>,
@@ -50,9 +49,6 @@ impl AnnounceRequest {
             AnnounceEvent::Empty => (),
         };
 
-        output.write_all(b"&compact=")?;
-        output.write_all(itoa::Buffer::new().format(self.compact as u8).as_bytes())?;
-
         if let Some(numwant) = self.numwant {
             output.write_all(b"&numwant=")?;
             output.write_all(itoa::Buffer::new().format(numwant).as_bytes())?;
@@ -162,7 +158,6 @@ impl AnnounceRequest {
             bytes_downloaded: opt_bytes_downloaded.with_context(|| "no downloaded")?,
             bytes_left: opt_bytes_left.with_context(|| "no left")?,
             event,
-            compact: true,
             numwant: opt_numwant,
             key: opt_key,
         })
@@ -352,7 +347,6 @@ mod tests {
             bytes_downloaded: 2,
             bytes_left: 3,
             event: AnnounceEvent::Started,
-            compact: true,
             numwant: Some(0),
             key: Some("4ab4b877".into()),
         })
@@ -400,7 +394,6 @@ mod tests {
                 bytes_downloaded: Arbitrary::arbitrary(g),
                 bytes_left: Arbitrary::arbitrary(g),
                 event: Arbitrary::arbitrary(g),
-                compact: true,
                 numwant: Arbitrary::arbitrary(g),
                 key: key.map(|key| key.into()),
             }