f Avoid unwrapping in peer parsing and add test

Author: tnull

src/peer_store.rs

@@ -155,24 +155,16 @@ impl TryFrom<String> for PeerInfo {
 	type Error = Error;
 
 	fn try_from(peer_pubkey_and_ip_addr: String) -> Result<Self, Self::Error> {
-		let mut pubkey_and_addr = peer_pubkey_and_ip_addr.split('@');
-		let pubkey = pubkey_and_addr.next();
-		let peer_addr_str = pubkey_and_addr.next();
-		if pubkey.is_none() || peer_addr_str.is_none() {
-			return Err(Error::PeerInfoParseFailed);
-		}
-
-		let peer_addr = peer_addr_str.unwrap().to_socket_addrs().map(|mut r| r.next());
-		if peer_addr.is_err() || peer_addr.as_ref().unwrap().is_none() {
-			return Err(Error::PeerInfoParseFailed);
-		}
-
-		let pubkey = hex_utils::to_compressed_pubkey(pubkey.unwrap());
-		if pubkey.is_none() {
-			return Err(Error::PeerInfoParseFailed);
+		if let Some((pubkey_str, peer_str)) = peer_pubkey_and_ip_addr.split_once('@') {
+			if let Some(pubkey) = hex_utils::to_compressed_pubkey(pubkey_str) {
+				if let Some(peer_addr) =
+					peer_str.to_socket_addrs().ok().and_then(|mut r| r.next()).map(|pa| pa)
+				{
+					return Ok(PeerInfo { pubkey, address: peer_addr });
+				}
+			}
 		}
-
-		Ok(PeerInfo { pubkey: pubkey.unwrap(), address: peer_addr.unwrap().unwrap() })
+		Err(Error::PeerInfoParseFailed)
 	}
 }
 
@@ -206,4 +198,35 @@ mod tests {
 		assert_eq!(peers[0], expected_peer_info);
 		assert!(!persister.get_and_clear_did_persist());
 	}
+
+	#[test]
+	fn peer_info_parsing() {
+		let valid_peer_info_str =
+			"0276607124ebe6a6c9338517b6f485825b27c2dcc0b9fc2aa6a4c0df91194e5993@127.0.0.1:9738"
+				.to_string();
+
+		let pubkey = PublicKey::from_str(
+			"0276607124ebe6a6c9338517b6f485825b27c2dcc0b9fc2aa6a4c0df91194e5993",
+		)
+		.unwrap();
+		let address: SocketAddr = "127.0.0.1:9738".parse().unwrap();
+		let expected_peer_info = PeerInfo { pubkey, address };
+
+		assert_eq!(Ok(expected_peer_info), PeerInfo::try_from(valid_peer_info_str));
+
+		let invalid_peer_info_str1 =
+			"02-76607124-ebe6a6c9338517b6f485825b27c2dcc0b9fc2aa6a4c0df91194e5993@127.0.0.1:9738"
+				.to_string();
+		assert_eq!(Err(Error::PeerInfoParseFailed), PeerInfo::try_from(invalid_peer_info_str1));
+
+		let invalid_peer_info_str2 =
+			"0276607124ebe6a6c9338517b6f485825b27c2dcc0b9fc2aa6a4c0df91194e5993@333.0.0.1:9738"
+				.to_string();
+		assert_eq!(Err(Error::PeerInfoParseFailed), PeerInfo::try_from(invalid_peer_info_str2));
+
+		let invalid_peer_info_str3 =
+			"0276607124ebe6a6c9338517b6f485825b27c2dcc0b9fc2aa6a4c0df91194e5993@127.0.0.19738"
+				.to_string();
+		assert_eq!(Err(Error::PeerInfoParseFailed), PeerInfo::try_from(invalid_peer_info_str3));
+	}
 }