fixes after rebase

Author: Frando

iroh-dns/src/discovery.rs

@@ -1,10 +1,8 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use futures::future::{BoxFuture, FutureExt};
-use iroh_net::key::SecretKey;
-use iroh_net::magicsock::Discovery;
-use iroh_net::{AddrInfo, NodeId};
+use futures::{future::FutureExt, stream::BoxStream, StreamExt};
+use iroh_net::{discovery::{Discovery, DiscoveryItem}, key::SecretKey, AddrInfo, MagicEndpoint, NodeId};
 use tracing::warn;
 
 use crate::publish::{self, Publisher};
@@ -49,7 +47,26 @@ impl Discovery for DnsDiscovery {
         }
     }
 
-    fn resolve<'a>(&'a self, node_id: &'a NodeId) -> BoxFuture<'a, Result<AddrInfo>> {
-        self.resolver.resolve_node_by_id(*node_id).boxed()
+    fn resolve(
+        &self,
+        _ep: MagicEndpoint,
+        node_id: NodeId,
+    ) -> Option<BoxStream<'static, Result<DiscoveryItem>>> {
+        let resolver = self.resolver.clone();
+        let fut = async move {
+            let addr_info = resolver.resolve_node_by_id(node_id).await?;
+            Ok(DiscoveryItem {
+                provenance: "iroh-dns",
+                last_updated: None,
+                addr_info,
+            })
+        };
+        // let fut = fut.map_ok(|addr_info| DiscoveryItem {
+        //     provenance: "iroh-dns",
+        //     last_updated: None,
+        //     addr_info,
+        // });
+        let stream = fut.into_stream();
+        Some(stream.boxed())
     }
 }

iroh/src/node.rs

@@ -35,7 +35,7 @@ use iroh_gossip::net::{Gossip, GOSSIP_ALPN};
 use iroh_io::AsyncSliceReader;
 use iroh_net::derp::DerpUrl;
 use iroh_net::magic_endpoint::get_alpn;
-use iroh_net::magicsock::Discovery;
+use iroh_net::discovery::Discovery;
 use iroh_net::magicsock::LocalEndpointsStream;
 use iroh_net::util::AbortingJoinHandle;
 use iroh_net::{