From e6e150a9b33b78d78cc557b80173a71f1da6d9ec Mon Sep 17 00:00:00 2001
From: Sam Stelfox <sstelfox@bedroomprogrammers.net>
Date: Tue, 2 Jul 2024 17:02:35 -0400
Subject: [PATCH] chore: some dead code fell out of the visibility changes

---
 src/codec/header/format_header.rs | 89 -------------------------------
 src/codec/header/key_count.rs     |  8 +--
 src/codec/header/mod.rs           |  1 -
 3 files changed, 2 insertions(+), 96 deletions(-)
 delete mode 100644 src/codec/header/format_header.rs

diff --git a/src/codec/header/format_header.rs b/src/codec/header/format_header.rs
deleted file mode 100644
index f0daa4e..0000000
--- a/src/codec/header/format_header.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use futures::AsyncWrite;
-
-use crate::codec::{ParserResult, Stream};
-
-use crate::codec::header::{IdentityHeader, PublicSettings};
-use crate::codec::FilesystemId;
-
-#[derive(Debug, PartialEq)]
-pub struct FormatHeader {
-    pub ecc_present: bool,
-    pub private: bool,
-    pub filesystem_id: FilesystemId,
-}
-
-impl FormatHeader {
-    pub async fn encode<W: AsyncWrite + Unpin + Send>(
-        &self,
-        writer: &mut W,
-    ) -> std::io::Result<usize> {
-        let mut written_bytes = 0;
-
-        written_bytes += IdentityHeader::encode(&IdentityHeader, writer).await?;
-        written_bytes += self.filesystem_id.encode(writer).await?;
-
-        let settings = PublicSettings::new(self.ecc_present, self.private);
-        written_bytes += settings.encode(writer).await?;
-
-        Ok(written_bytes)
-    }
-
-    pub fn parse_with_magic(input: Stream) -> ParserResult<Self> {
-        let (input, _) = IdentityHeader::parse_with_magic(input)?;
-        let (input, filesystem_id) = FilesystemId::parse(input)?;
-        let (input, settings) = PublicSettings::parse(input)?;
-
-        let header = FormatHeader {
-            ecc_present: settings.ecc_present(),
-            private: settings.private(),
-            filesystem_id,
-        };
-
-        Ok((input, header))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use rand::Rng;
-
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::*;
-
-    #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test(async))]
-    #[cfg_attr(not(target_arch = "wasm32"), tokio::test)]
-    async fn test_public_round_trip() {
-        let mut rng = crate::utils::crypto_rng();
-
-        // Manually construct an IdentityHeader...
-        let mut source = crate::codec::header::BANYAN_FS_MAGIC.to_vec();
-        source.extend(&[0x01]);
-
-        // Followed by a filesystem ID
-        let raw_id: [u8; 16] = rng.gen();
-        source.extend(&raw_id);
-        let filesystem_id = FilesystemId::from(raw_id);
-
-        // A public non-ECC header
-        source.extend(&[0x00]);
-
-        let (remaining, parsed) = FormatHeader::parse_with_magic(Stream::new(&source)).unwrap();
-        assert!(remaining.is_empty());
-        assert_eq!(
-            parsed,
-            FormatHeader {
-                ecc_present: false,
-                private: false,
-                filesystem_id
-            }
-        );
-
-        let mut encoded = Vec::new();
-        let size = parsed.encode(&mut encoded).await.unwrap();
-
-        assert_eq!(source, encoded);
-        assert_eq!(source.len(), size);
-    }
-}
diff --git a/src/codec/header/key_count.rs b/src/codec/header/key_count.rs
index 5a574b0..9d87149 100644
--- a/src/codec/header/key_count.rs
+++ b/src/codec/header/key_count.rs
@@ -9,21 +9,17 @@ use crate::codec::{ParserResult, Stream};
 pub struct KeyCount(u8);
 
 impl KeyCount {
-    pub async fn encode<W: AsyncWrite + Unpin + Send>(
+    pub(crate) async fn encode<W: AsyncWrite + Unpin + Send>(
         &self,
         writer: &mut W,
     ) -> std::io::Result<usize> {
         writer.write_all(&[self.0]).await?;
         Ok(1)
     }
-    pub fn parse(input: Stream) -> ParserResult<Self> {
+    pub(crate) fn parse(input: Stream) -> ParserResult<Self> {
         let (input, count) = take(1u8).parse_peek(input)?;
         Ok((input, Self(count[0])))
     }
-
-    pub const fn size() -> usize {
-        1
-    }
 }
 
 impl Deref for KeyCount {
diff --git a/src/codec/header/mod.rs b/src/codec/header/mod.rs
index 1520f45..4d2e3ec 100644
--- a/src/codec/header/mod.rs
+++ b/src/codec/header/mod.rs
@@ -1,6 +1,5 @@
 mod access_mask;
 mod content_options;
-mod format_header;
 mod identity_header;
 mod key_count;
 mod public_settings;