From 7dc6b1fae6b8e72cbed16d75168c740239819265 Mon Sep 17 00:00:00 2001
From: Pan Chasinga <jo.chasinga@gmail.com>
Date: Wed, 17 Nov 2021 09:59:07 -0800
Subject: [PATCH] Returns an Option for MdnsPeer::new(...)

Per @MarcoPolo points that an error isn't useful for the caller
and following MdnsPacket API.

See also: https://github.com/libp2p/rust-libp2p/pull/2311#discussion_r750870918
---
 protocols/mdns/src/query.rs | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/protocols/mdns/src/query.rs b/protocols/mdns/src/query.rs
index b68f5724f048..662ecac273ce 100644
--- a/protocols/mdns/src/query.rs
+++ b/protocols/mdns/src/query.rs
@@ -159,13 +159,7 @@ impl MdnsResponse {
                     _ => return None,
                 };
 
-                match MdnsPeer::new(&packet, record_value, record.ttl) {
-                    Ok(peer) => Some(peer),
-                    Err(err) => {
-                        log::debug!("Creating mdns peer failed: {:?}", err);
-                        None
-                    }
-                }
+                MdnsPeer::new(&packet, record_value, record.ttl)
             })
             .collect();
 
@@ -209,7 +203,7 @@ impl MdnsPeer {
         packet: &Packet<'_>,
         record_value: String,
         ttl: u32,
-    ) -> Result<MdnsPeer, String> {
+    ) -> Option<MdnsPeer> {
         let mut my_peer_id: Option<PeerId> = None;
         let addrs = packet
             .additional
@@ -265,12 +259,12 @@ impl MdnsPeer {
 
         match my_peer_id {
             Some(peer_id) =>
-                Ok(MdnsPeer {
+                Some(MdnsPeer {
                     addrs,
                     peer_id,
                     ttl,
                 }),
-            None => Err("Missing Peer ID".to_string())
+            None => None,
         }
     }
 
@@ -309,7 +303,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_create_mdns_peer() -> Result<(), String> {
+    fn test_create_mdns_peer() {
         let ttl = 300;
         let peer_id = PeerId::random();
 
@@ -341,11 +335,9 @@ mod tests {
                     return Some(record_value);
                 }).next().unwrap();
 
-            let peer = MdnsPeer::new(&packet, record_value, ttl)?;
+            let peer = MdnsPeer::new(&packet, record_value, ttl).unwrap();
             assert_eq!(peer.peer_id, peer_id);
         }
-
-        Ok(())
     }
 }