fix testing in onionv3

Author: jbesraa

lightning/src/ln/msgs.rs

@@ -638,22 +638,29 @@ impl Readable for NetAddress {
 	}
 }
 
+fn rem_first_and_last(value: &str) -> &str {
+    let mut chars = value.chars();
+    chars.next();
+    chars.next_back();
+    chars.as_str()
+}
+
 impl FromStr for NetAddress {
     type Err = AddrParseError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let host: String = s.split("@").collect::<Vec<&str>>()[0].parse().expect("Invalid hostname");
-        let port: u16 = s.split("@").collect::<Vec<&str>>()[1].parse().expect("Invalid port");
+        let trim_s_by_latest_colon = s.rfind(":").unwrap();
+        let host = &s[..trim_s_by_latest_colon];
+        let port: u16 = s[trim_s_by_latest_colon + 1..].parse().expect("Invalid port");
         if let Ok(addr) = host.parse::<Ipv4Addr>() {
             let addr = SocketAddrV4::new(addr, port);
             return Ok(NetAddress::IPv4 { addr: addr.ip().octets(), port });
         }
-        if let Ok(addr) = host.parse::<Ipv6Addr>() {
+        if let Ok(addr) = rem_first_and_last(host).parse::<Ipv6Addr>() {
             let addr = SocketAddrV6::new(addr, port, 0, 0);
             return Ok(NetAddress::IPv6 { addr: addr.ip().octets(), port });
         };
         if host.ends_with(".onion") {
-            // tests are failing
             let onion = host.split(".onion").collect::<Vec<&str>>()[0];
             let onion = base32::decode(base32::Alphabet::RFC4648 { padding: false }, &onion).expect("error in onion");
             let version = onion[0];
@@ -662,7 +669,7 @@ impl FromStr for NetAddress {
             return Ok(NetAddress::OnionV3 { ed25519_pubkey, checksum, version, port });
         }
 
-        if let Ok(hostname) = Hostname::try_from(host) {
+        if let Ok(hostname) = Hostname::try_from(host.to_string()) {
             return Ok(NetAddress::Hostname { hostname, port });
         }
 
@@ -3036,7 +3043,7 @@ mod tests {
 			});
 		}
 		Ok(encoded_payload)
-	}
+    }
 
     #[test]
     fn net_address_from_str() {
@@ -3053,15 +3060,16 @@ mod tests {
             port: 1234,
         };
         let onionv3_net_address = NetAddress::OnionV3 {
-            port: 1234,
-            ed25519_pubkey: [0xab; 32],
-            checksum: 0x1234,
-            version: 0x03,
+            ed25519_pubkey: [37, 24, 75, 5, 25, 73, 117, 194, 139, 102, 182, 107, 4, 105, 247, 246, 85,
+            111, 177, 172, 49, 137, 167, 155, 64, 221, 163, 47, 31, 33, 71, 3],
+            checksum: 48326,
+            version: 121,
+            port: 1234
         };
-        let valid_ipv4 = "127.0.0.1@1234";
-        let valid_ipv6 = "0:0:0:0:0:0:0:1@1234";
-        let valid_hostname = "example.com@1234";
-        let valid_onionv3 = "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789.onion@1234";
+        let valid_ipv4 = "127.0.0.1:1234";
+        let valid_ipv6 = "[0:0:0:0:0:0:0:1]:1234";
+        let valid_hostname = "example.com:1234";
+        let valid_onionv3 = "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:1234";
         let result_ipv4 = NetAddress::from_str(valid_ipv4).unwrap();
         let result_ipv6 = NetAddress::from_str(valid_ipv6).unwrap();
         let result_hostname = NetAddress::from_str(valid_hostname).unwrap();