remove crockford encoding

Author: jbesraa

lightning/src/util/base32.rs

@@ -30,22 +30,17 @@ pub enum Alphabet {
         /// Whether to use padding.
         padding: bool
     },
-    /// Crockford base32 encoding.
-    Crockford,
 }
 
 /// RFC4648 base32 encoding with padding.
 const RFC4648_ALPHABET: &'static [u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
 
-/// Crockford base32 encoding.
-const CROCKFORD_ALPHABET: &'static [u8] = b"0123456789ABCDEFGHJKMNPQRSTVWXYZ";
-
 /// Encode a byte slice into a base32 string.
 pub fn encode(alphabet: Alphabet, data: &[u8]) -> String {
     let (alphabet, padding) = match alphabet {
         Alphabet::RFC4648 { padding } => (RFC4648_ALPHABET, padding),
-        Alphabet::Crockford => (CROCKFORD_ALPHABET, false),
     };
+
     let mut ret = Vec::with_capacity((data.len() + 3) / 4 * 5);
 
     for chunk in data.chunks(5) {
@@ -87,18 +82,11 @@ const RFC4648_INV_ALPHABET: [i8; 43] = [
     9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
 ];
 
-/// Inverse Crockford lookup table for decoding.
-const CROCKFORD_INV_ALPHABET: [i8; 43] = [
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, 16, 17, 1,
-    18, 19, 1, 20, 21, 0, 22, 23, 24, 25, 26, -1, 27, 28, 29, 30, 31,
-];
-
 /// Decode a base32 string into a byte vector.
 pub fn decode(alphabet: Alphabet, data: &str) -> Option<Vec<u8>> {
     let data = data.as_bytes();
     let alphabet = match alphabet {
         Alphabet::RFC4648 { .. } => RFC4648_INV_ALPHABET,
-        Alphabet::Crockford => CROCKFORD_INV_ALPHABET,
     };
     let mut unpadded_data_length = data.len();
 	data.iter().rev().take(6).for_each(|&c| {
@@ -131,9 +119,8 @@ pub fn decode(alphabet: Alphabet, data: &str) -> Option<Vec<u8>> {
 }
 
 #[cfg(test)]
-#[allow(dead_code, unused_attributes)]
 mod test {
-    use super::Alphabet::{Crockford, RFC4648};
+    use super::Alphabet::RFC4648;
     use super::{decode, encode};
     use std::fmt::{Debug, Error, Formatter};
 
@@ -148,26 +135,6 @@ mod test {
         }
     }
 
-    #[test]
-    fn masks_crockford() {
-        assert_eq!(
-            encode(Crockford, &[0xF8, 0x3E, 0x0F, 0x83, 0xE0]),
-            "Z0Z0Z0Z0"
-        );
-        assert_eq!(
-            encode(Crockford, &[0x07, 0xC1, 0xF0, 0x7C, 0x1F]),
-            "0Z0Z0Z0Z"
-        );
-        assert_eq!(
-            decode(Crockford, "Z0Z0Z0Z0").unwrap(),
-            [0xF8, 0x3E, 0x0F, 0x83, 0xE0]
-        );
-        assert_eq!(
-            decode(Crockford, "0Z0Z0Z0Z").unwrap(),
-            [0x07, 0xC1, 0xF0, 0x7C, 0x1F]
-        );
-    }
-
     #[test]
     fn masks_rfc4648() {
         assert_eq!(
@@ -234,17 +201,6 @@ mod test {
         }
     }
 
-    #[test]
-    #[allow(non_snake_case)]
-    fn iIlL1_oO0() {
-        assert_eq!(decode(Crockford, "IiLlOo"), decode(Crockford, "111100"));
-    }
-
-    #[test]
-    fn invalid_chars_crockford() {
-        assert_eq!(decode(Crockford, ","), None)
-    }
-
     #[test]
     fn invalid_chars_rfc4648() {
         assert_eq!(decode(RFC4648 { padding: true }, ","), None)