fixup: naming + remove leftover comment

keepsimple1 · Apr 16, 2024 · 69e6da2 · 69e6da2
1 parent d1eb6d3
commit 69e6da2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/service_daemon.rs b/src/service_daemon.rs
@@ -611,7 +611,7 @@ impl ServiceDaemon {
                     call_hostname_resolution_listener(
                         &zc.hostname_resolvers,
                         hostname,
-                        HostnameResolutionEvent::HostnameAddressesRemoved(
+                        HostnameResolutionEvent::AddressesRemoved(
                             hostname.to_string(),
                             zc.cache.get_addresses_for_host(hostname),
                         ),
@@ -1122,7 +1122,6 @@ impl Zeroconf {
             my_services: HashMap::new(),
             cache: DnsCache::new(),
             hostname_resolvers: HashMap::new(),
-            // hostname_resolver_timeouts: HashMap::new(),
             service_queriers: HashMap::new(),
             retransmissions: Vec::new(),
             counters: HashMap::new(),
@@ -1723,7 +1722,7 @@ impl Zeroconf {
     ) {
         let addresses = self.cache.get_addresses_for_host(hostname);
         if !addresses.is_empty() {
-            match sender.send(HostnameResolutionEvent::HostnameAddressesFound(
+            match sender.send(HostnameResolutionEvent::AddressesFound(
                 hostname.to_string(),
                 addresses,
             )) {
@@ -1887,10 +1886,7 @@ impl Zeroconf {
                 call_hostname_resolution_listener(
                     &self.hostname_resolvers,
                     hostname,
-                    HostnameResolutionEvent::HostnameAddressesFound(
-                        hostname.to_string(),
-                        addresses,
-                    ),
+                    HostnameResolutionEvent::AddressesFound(hostname.to_string(), addresses),
                 )
             });
 
@@ -2156,9 +2152,9 @@ pub enum HostnameResolutionEvent {
     /// Started searching for the ip address of a hostname.
     SearchStarted(String),
     /// One or more addresses for a hostname has been found.
-    HostnameAddressesFound(String, HashSet<IpAddr>),
+    AddressesFound(String, HashSet<IpAddr>),
     /// One or more addresses for a hostname has been removed.
-    HostnameAddressesRemoved(String, HashSet<IpAddr>),
+    AddressesRemoved(String, HashSet<IpAddr>),
     /// The search for the ip address of a hostname has timed out.
     SearchTimeout(String),
     /// Stopped searching for the ip address of a hostname.

diff --git a/tests/mdns_test.rs b/tests/mdns_test.rs
@@ -1078,7 +1078,7 @@ fn test_hostname_resolution() {
     let event_receiver = d.resolve_hostname(hostname, Some(2000)).unwrap();
     let resolved = loop {
         match event_receiver.recv() {
-            Ok(HostnameResolutionEvent::HostnameAddressesFound(found_hostname, addresses)) => {
+            Ok(HostnameResolutionEvent::AddressesFound(found_hostname, addresses)) => {
                 assert!(found_hostname == hostname);
                 assert!(addresses.contains(&service_ip_addr));
                 break true;
@@ -1106,7 +1106,7 @@ fn hostname_resolution_timeout() {
     let event_receiver = d.resolve_hostname(hostname, Some(2000)).unwrap();
     let resolved = loop {
         match event_receiver.recv() {
-            Ok(HostnameResolutionEvent::HostnameAddressesFound(found_hostname, _addresses)) => {
+            Ok(HostnameResolutionEvent::AddressesFound(found_hostname, _addresses)) => {
                 assert!(found_hostname == hostname);
                 break true;
             }