f - remove Bech32WithoutChecksumWriter

Author: jkczyz

src/lib.rs

@@ -221,40 +221,6 @@ impl<'a> Drop for Bech32Writer<'a> {
     }
 }
 
-/// Allocationless Bech32 writer that doesn't write a checksum.
-pub struct Bech32WithoutChecksumWriter<'a> {
-    formatter: &'a mut fmt::Write,
-}
-
-impl<'a> Bech32WithoutChecksumWriter<'a> {
-    /// Creates a new writer that can write a bech32 string without allocating itself.
-    ///
-    /// This is a rather low-level API and doesn't check the HRP or data length for standard
-    /// compliance.
-    pub fn new(
-        hrp: &str,
-        fmt: &'a mut fmt::Write,
-    ) -> Result<Bech32WithoutChecksumWriter<'a>, fmt::Error> {
-        let writer = Self {
-            formatter: fmt,
-        };
-
-        writer.formatter.write_str(hrp)?;
-        writer.formatter.write_char(SEP)?;
-
-        Ok(writer)
-    }
-}
-
-impl<'a> WriteBase32 for Bech32WithoutChecksumWriter<'a> {
-    type Err = fmt::Error;
-
-    /// Writes a single 5 bit value of the data part
-    fn write_u5(&mut self, data: u5) -> fmt::Result {
-        self.formatter.write_char(data.to_char())
-    }
-}
-
 /// Parse/convert base32 slice to `Self`. It is the reciprocal of
 /// `ToBase32`.
 pub trait FromBase32: Sized {
@@ -471,15 +437,20 @@ pub fn encode_without_checksum_to_fmt<T: AsRef<[u5]>>(
     hrp: &str,
     data: T,
 ) -> Result<fmt::Result, Error> {
-    let hrp_lower = match check_hrp(hrp)? {
+    let hrp = match check_hrp(hrp)? {
         Case::Upper => Cow::Owned(hrp.to_lowercase()),
         Case::Lower | Case::None => Cow::Borrowed(hrp),
     };
 
-    match Bech32WithoutChecksumWriter::new(&hrp_lower, fmt) {
-        Ok(mut writer) => Ok(writer.write(data.as_ref())),
-        Err(e) => Ok(Err(e)),
-    }
+    let mut write = || {
+        fmt.write_str(&hrp)?;
+        fmt.write_char(SEP)?;
+        for b in data.as_ref() {
+            fmt.write_char(b.to_char())?;
+        }
+        Ok(())
+    };
+    Ok(write())
 }
 
 /// Used for encode/decode operations for the two variants of Bech32
@@ -1022,13 +993,13 @@ mod tests {
 
         let mut written_str = String::new();
         {
-            let mut writer = Bech32WithoutChecksumWriter::new(hrp, &mut written_str).unwrap();
+            let mut writer = Bech32Writer::new(hrp, Variant::Bech32, &mut written_str).unwrap();
             writer.write(&data).unwrap();
         }
 
         let encoded_str = encode_without_checksum(hrp, data).unwrap();
 
-        assert_eq!(encoded_str, written_str);
+        assert_eq!(encoded_str, written_str[..written_str.len() - CHECKSUM_LENGTH]);
     }
 
     #[test]
@@ -1047,22 +1018,6 @@ mod tests {
         assert_eq!(encoded_str, written_str);
     }
 
-    #[test]
-    fn write_without_checksum_on_drop() {
-        let hrp = "lntb";
-        let data = "Hello World!".as_bytes().to_base32();
-
-        let mut written_str = String::new();
-        {
-            let mut writer = Bech32WithoutChecksumWriter::new(hrp, &mut written_str).unwrap();
-            writer.write(&data).unwrap();
-        }
-
-        let encoded_str = encode_without_checksum(hrp, data).unwrap();
-
-        assert_eq!(encoded_str, written_str);
-    }
-
     #[test]
     fn test_hrp_case() {
         // Tests for issue with HRP case checking being ignored for encoding