Drop OnionV2 parser

Author: yanganto

lightning/src/ln/msgs.rs

@@ -918,8 +918,8 @@ pub enum SocketAddressParseError {
 	InvalidInput,
 	/// Invalid port
 	InvalidPort,
-	/// Invalid onion address
-	InvalidOnion,
+	/// Invalid onion v3 address
+	InvalidOnionV3,
 }
 
 impl fmt::Display for SocketAddressParseError {
@@ -929,7 +929,7 @@ impl fmt::Display for SocketAddressParseError {
 			SocketAddressParseError::InvalidInput => write!(f, "Invalid input format. \
 				Expected: \"<ipv4>:<port>\", \"[<ipv6>]:<port>\", \"<onion address>.onion:<port>\" or \"<hostname>:<port>\""),
 			SocketAddressParseError::InvalidPort => write!(f, "Invalid port"),
-			SocketAddressParseError::InvalidOnion => write!(f, "Invalid onion address"),
+			SocketAddressParseError::InvalidOnionV3 => write!(f, "Invalid onion v3 address"),
 		}
 	}
 }
@@ -964,18 +964,12 @@ impl From<std::net::SocketAddr> for SocketAddress {
 pub fn parse_onion_address(host: &str, port: u16) -> Result<SocketAddress, SocketAddressParseError> {
 	if host.ends_with(".onion") {
 		let domain = &host[..host.len() - ".onion".len()];
-		if domain.len() != 56 && domain.len() != 16 {
-			return Err(SocketAddressParseError::InvalidOnion);
-		}
-		let mut onion = base32::Alphabet::RFC4648 { padding: false }.decode(&domain).map_err(|_| SocketAddressParseError::InvalidOnion)?;
-		if onion.len() == 10 {
-			onion.extend_from_slice(&port.to_be_bytes());
-			let mut bytes = [0; 12];
-			bytes.copy_from_slice(&onion);
-			return Ok(SocketAddress::OnionV2(bytes));
+		if domain.len() != 56 {
+			return Err(SocketAddressParseError::InvalidOnionV3);
 		}
+		let onion = base32::Alphabet::RFC4648 { padding: false }.decode(&domain).map_err(|_| SocketAddressParseError::InvalidOnionV3)?;
 		if onion.len() != 35 {
-			return Err(SocketAddressParseError::InvalidOnion);
+			return Err(SocketAddressParseError::InvalidOnionV3);
 		}
 		let version = onion[0];
 		let first_checksum_flag = onion[1];
@@ -4129,8 +4123,8 @@ mod tests {
 		assert_eq!(hostname, SocketAddress::from_str(&hostname.to_string()).unwrap());
 
 		let onion_v2 = SocketAddress::OnionV2 ([40, 4, 64, 185, 202, 19, 162, 75, 90, 200, 38, 7],);
-		assert_eq!(onion_v2, SocketAddress::from_str("facebookcorewwwi.onion:9735").unwrap());
-		assert_eq!(onion_v2, SocketAddress::from_str(&onion_v2.to_string()).unwrap());
+		assert_eq!("FACEBOOKCOREWWWI.onion:9735", &onion_v2.to_string());
+		assert_eq!(Err(SocketAddressParseError::InvalidOnionV3), SocketAddress::from_str("FACEBOOKCOREWWWI.onion:9735"));
 
 		let onion_v3 = SocketAddress::OnionV3 {
 			ed25519_pubkey: [37, 24, 75, 5, 25, 73, 117, 194, 139, 102, 182, 107, 4, 105, 247, 246, 85,
@@ -4142,7 +4136,7 @@ mod tests {
 		assert_eq!(onion_v3, SocketAddress::from_str("pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:1234").unwrap());
 		assert_eq!(onion_v3, SocketAddress::from_str(&onion_v3.to_string()).unwrap());
 
-		assert_eq!(Err(SocketAddressParseError::InvalidOnion), SocketAddress::from_str("pg6mmjiyjmcrsslvykfwnntlaru7p5svn6.onion:1234"));
+		assert_eq!(Err(SocketAddressParseError::InvalidOnionV3), SocketAddress::from_str("pg6mmjiyjmcrsslvykfwnntlaru7p5svn6.onion:1234"));
 		assert_eq!(Err(SocketAddressParseError::InvalidInput), SocketAddress::from_str("127.0.0.1@1234"));
 		assert_eq!(Err(SocketAddressParseError::InvalidInput), "".parse::<SocketAddress>());
 		assert!(SocketAddress::from_str("pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion.onion:9735:94").is_err());