move zbase32 to base32

Author: jbesraa

fuzz/src/base32.rs

@@ -13,12 +13,13 @@ use crate::utils::test_logger;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
-	let res = base32::encode(base32::Alphabet::Crockford, data);
-	assert_eq!(&base32::decode(base32::Alphabet::Crockford, &res).unwrap()[..], data);
+	let res = base32::Alphabet::RFC4648 { padding: false }.encode(data);
+	assert_eq!(&base32::Alphabet::RFC4648 { padding: false }.decode(&res).unwrap()[..], data);
 
 	if let Ok(s) = std::str::from_utf8(data) {
-		if let Some(decoded) = base32::decode(base32::Alphabet::Crockford,s) {
-			assert_eq!(&base32::encode(base32::Alphabet::Crockford,&decoded), &s.to_ascii_lowercase());
+		let res = base32::Alphabet::RFC4648 { padding: false }.decode(s);
+		if let Ok(decoded) = res {
+			assert_eq!(&base32::Alphabet::RFC4648 { padding: false }.encode(&decoded), &s.to_ascii_lowercase());
 		}
 	}
 }

fuzz/src/zbase32.rs

@@ -7,18 +7,18 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-use lightning::util::zbase32;
+use lightning::util::base32;
 
 use crate::utils::test_logger;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
-	let res = zbase32::encode(data);
-	assert_eq!(&zbase32::decode(&res).unwrap()[..], data);
+	let res = base32::Alphabet::ZBase32.encode(data);
+	assert_eq!(&base32::Alphabet::ZBase32.decode(&res).unwrap()[..], data);
 
 	if let Ok(s) = std::str::from_utf8(data) {
-		if let Ok(decoded) = zbase32::decode(s) {
-			assert_eq!(&zbase32::encode(&decoded), &s.to_ascii_lowercase());
+		if let Ok(decoded) = base32::Alphabet::ZBase32.decode(s) {
+			assert_eq!(&base32::Alphabet::ZBase32.encode(&decoded), &s.to_ascii_lowercase());
 		}
 	}
 }

lightning/src/ln/msgs.rs

@@ -938,9 +938,10 @@ impl FromStr for NetAddress {
                         Some(onion) => onion,
                         None => return Err(e),
                     };
-                    let onion = match base32::decode(base32::Alphabet::RFC4648 { padding: false }, &onion) {
-                        Some(onion) => onion,
-                        None => return Err(e),
+					let decoded_onion = base32::Alphabet::RFC4648 { padding: false }.decode(&onion);
+                    let onion = match decoded_onion {
+                        Ok(onion) => onion,
+						Err(_) => return Err(e)
                     };
                     let version = match onion.get(0) {
                         Some(version) => version,