refactor: minor consistency adjustments

iroh/src/discovery.rs

@@ -879,7 +879,7 @@ mod test_dns_pkarr {
         let publisher = PkarrPublisher::new(secret_key, dns_pkarr_server.pkarr_url.clone());
         let data = NodeData::new(relay_url.clone(), Default::default());
         // does not block, update happens in background task
-        publisher.update_addr_info(&data);
+        publisher.update_node_data(&data);
         // wait until our shared state received the update from pkarr publishing
         dns_pkarr_server.on_node(&node_id, PUBLISH_TIMEOUT).await?;
         let resolved = resolver.lookup_node_by_id(&node_id, &origin).await?;

iroh/src/discovery/pkarr.rs

@@ -193,7 +193,7 @@ impl PkarrPublisher {
     /// Publishes the addressing information about this node to a pkarr relay.
     ///
     /// This is a nonblocking function, the actual update is performed in the background.
-    pub fn update_addr_info(&self, data: &NodeData) {
+    pub fn update_node_data(&self, data: &NodeData) {
         let mut data = data.clone();
         if data.relay_url().is_some() {
             // If relay url is set: only publish relay url, and no direct addrs.
@@ -206,7 +206,7 @@ impl PkarrPublisher {
 
 impl Discovery for PkarrPublisher {
     fn publish(&self, data: &NodeData) {
-        self.update_addr_info(data);
+        self.update_node_data(data);
     }
 }
 

iroh/src/discovery/static_provider.rs

@@ -132,12 +132,15 @@ impl StaticProvider {
     /// Sets node addressing information for the given node ID.
     ///
     /// This will completely overwrite any existing info for the node.
-    pub fn set_node_info(&self, node_info: impl Into<NodeInfo>) -> Option<NodeAddr> {
+    ///
+    /// Returns the [`NodeData`] of the previous entry, or `None` if there was no previous
+    /// entry for this node ID.
+    pub fn set_node_info(&self, node_info: impl Into<NodeInfo>) -> Option<NodeData> {
         let last_updated = SystemTime::now();
         let NodeInfo { node_id, data } = node_info.into();
         let mut guard = self.nodes.write().expect("poisoned");
         let previous = guard.insert(node_id, StoredNodeInfo { data, last_updated });
-        previous.map(|x| NodeInfo::from_parts(node_id, x.data).into_node_addr())
+        previous.map(|x| x.data)
     }
 
     /// Augments node addressing information for the given node ID.