tentative fix for ipv6 address issues

Author: isabelatkinson

src/sdam/description/server.rs

@@ -306,7 +306,7 @@ impl ServerDescription {
         Ok(set_name)
     }
 
-    pub(crate) fn known_hosts(&self) -> Result<impl Iterator<Item = &String>> {
+    pub(crate) fn known_hosts(&self) -> Result<Vec<ServerAddress>> {
         let known_hosts = self
             .reply
             .as_ref()
@@ -324,7 +324,11 @@ impl ServerDescription {
                     .chain(arbiters.into_iter().flatten())
             });
 
-        Ok(known_hosts.into_iter().flatten())
+        known_hosts
+            .into_iter()
+            .flatten()
+            .map(ServerAddress::parse)
+            .collect()
     }
 
     pub(crate) fn invalid_me(&self) -> Result<bool> {

src/sdam/description/topology.rs

@@ -603,7 +603,7 @@ impl TopologyDescription {
             return Ok(());
         }
 
-        self.add_new_servers(server_description.known_hosts()?)?;
+        self.add_new_servers(server_description.known_hosts()?);
 
         if server_description.invalid_me()? {
             self.servers.remove(&server_description.address);
@@ -697,11 +697,11 @@ impl TopologyDescription {
             }
         }
 
-        self.add_new_servers(server_description.known_hosts()?)?;
-        let known_hosts: HashSet<_> = server_description.known_hosts()?.collect();
+        let known_hosts = server_description.known_hosts()?;
+        self.add_new_servers(known_hosts.clone());
 
         for address in addresses {
-            if !known_hosts.contains(&address.to_string()) {
+            if !known_hosts.contains(&address) {
                 self.servers.remove(&address);
             }
         }
@@ -728,20 +728,9 @@ impl TopologyDescription {
     }
 
     /// Create a new ServerDescription for each address and add it to the topology.
-    fn add_new_servers<'a>(&mut self, servers: impl Iterator<Item = &'a String>) -> Result<()> {
-        let servers: Result<Vec<_>> = servers.map(ServerAddress::parse).collect();
-
-        self.add_new_servers_from_addresses(servers?.iter());
-        Ok(())
-    }
-
-    /// Create a new ServerDescription for each address and add it to the topology.
-    fn add_new_servers_from_addresses<'a>(
-        &mut self,
-        servers: impl Iterator<Item = &'a ServerAddress>,
-    ) {
+    fn add_new_servers(&mut self, servers: Vec<ServerAddress>) {
         for server in servers {
-            if !self.servers.contains_key(server) {
+            if !self.servers.contains_key(&server) {
                 self.servers
                     .insert(server.clone(), ServerDescription::new(server.clone()));
             }

src/sdam/topology.rs

@@ -377,7 +377,9 @@ impl TopologyWorker {
                             UpdateMessage::SyncHosts(hosts) => {
                                 self.sync_hosts(hosts).await
                             }
-                            UpdateMessage::ServerUpdate(sd) => self.update_server(*sd).await,
+                            UpdateMessage::ServerUpdate(sd) => {
+                                self.update_server(*sd).await
+                            }
                             UpdateMessage::MonitorError { address, error } => {
                                 self.handle_monitor_error(address, error).await
                             }