refactor(iroh): move ProtocolHandler impl to iroh-gossip (#2849)

Depends on n0-computer/iroh-gossip#3

Cargo.toml

@@ -53,3 +53,4 @@ iroh-test = { path = "./iroh-test" }
 iroh-router = { path = "./iroh-router" }
 
 iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "main" }
+iroh-gossip = { git = "https://github.com/n0-computer/iroh-gossip", branch = "main" }

deny.toml

@@ -38,4 +38,5 @@ ignore = [
 [sources]
 allow-git = [
     "https://github.com/n0-computer/iroh-blobs.git",
+    "https://github.com/n0-computer/iroh-gossip.git",
 ]

iroh/src/node/builder.rs

@@ -33,10 +33,7 @@ use tokio::task::JoinError;
 use tokio_util::{sync::CancellationToken, task::AbortOnDropHandle};
 use tracing::{debug, error_span, trace, Instrument};
 
-use super::{
-    protocol::gossip::GossipProtocol, rpc_status::RpcStatus, IrohServerEndpoint, JoinErrToStr,
-    Node, NodeInner,
-};
+use super::{rpc_status::RpcStatus, IrohServerEndpoint, JoinErrToStr, Node, NodeInner};
 use crate::{
     client::RPC_ALPN,
     node::{
@@ -826,7 +823,7 @@ impl<D: iroh_blobs::store::Store> ProtocolBuilder<D> {
         self = self.accept(iroh_blobs::protocol::ALPN.to_vec(), Arc::new(blobs_proto));
 
         // Register gossip.
-        self = self.accept(GOSSIP_ALPN.to_vec(), Arc::new(GossipProtocol(gossip)));
+        self = self.accept(GOSSIP_ALPN.to_vec(), Arc::new(gossip));
 
         // Register docs, if enabled.
         if let Some(docs) = docs {

iroh/src/node/protocol.rs

@@ -1,3 +1,2 @@
 pub(crate) mod blobs;
 pub(crate) mod docs;
-pub(crate) mod gossip;

iroh/src/node/rpc.rs

@@ -27,7 +27,7 @@ use iroh_blobs::{
     BlobFormat, HashAndFormat, Tag,
 };
 use iroh_docs::net::DOCS_ALPN;
-use iroh_gossip::net::GOSSIP_ALPN;
+use iroh_gossip::net::{Gossip, GOSSIP_ALPN};
 use iroh_io::AsyncSliceReader;
 use iroh_net::{relay::RelayUrl, NodeAddr, NodeId};
 use iroh_router::Router;
@@ -44,7 +44,7 @@ use crate::{
         NodeStatus,
     },
     node::{
-        protocol::{blobs::BlobsProtocol, docs::DocsProtocol, gossip::GossipProtocol},
+        protocol::{blobs::BlobsProtocol, docs::DocsProtocol},
         NodeInner,
     },
     rpc_protocol::{
@@ -257,7 +257,7 @@ impl<D: BaoStore> Handler<D> {
                 chan.bidi_streaming(msg, self, |handler, req, updates| {
                     let stream = handler
                         .router
-                        .get_protocol::<GossipProtocol>(GOSSIP_ALPN)
+                        .get_protocol::<Gossip>(GOSSIP_ALPN)
                         .expect("missing gossip")
                         .join_with_stream(
                             req.topic,