feat(iroh-gossip)!: dispatch gossip events and updates by topic

iroh-cli/src/commands/gossip.rs

@@ -65,22 +65,22 @@ impl GossipCommands {
                         line = input_lines.next_line() => {
                             let line = line.context("failed to read from stdin")?;
                             if let Some(line) = line {
-                                sink.send(iroh_gossip::dispatcher::Command::Broadcast(line.into())).await?;
+                                sink.send(iroh_gossip::net::Command::Broadcast(line.into())).await?;
                             } else {
                                 break;
                             }
                         }
                         res = stream.next() => {
                             let res = res.context("gossip stream ended")?.context("failed to read gossip stream")?;
                             match res {
-                                iroh_gossip::dispatcher::Event::Gossip(event) => {
+                                iroh_gossip::net::Event::Gossip(event) => {
                                     if verbose {
                                         println!("{:?}", event);
-                                    } else if let iroh_gossip::dispatcher::GossipEvent::Received(iroh_gossip::dispatcher::Message { content, .. }) = event {
+                                    } else if let iroh_gossip::net::GossipEvent::Received(iroh_gossip::net::Message { content, .. }) = event {
                                         println!("{:?}", content);
                                     }
                                 }
-                                iroh_gossip::dispatcher::Event::Lagged => {
+                                iroh_gossip::net::Event::Lagged => {
                                     anyhow::bail!("gossip stream lagged");
                                 }
                             };

iroh-docs/src/engine.rs

@@ -23,7 +23,6 @@ use tracing::{error, error_span, Instrument};
 use crate::{actor::SyncHandle, ContentStatus, ContentStatusCallback, Entry, NamespaceId};
 use crate::{Author, AuthorId};
 
-use self::gossip::GossipActor;
 use self::live::{LiveActor, ToLiveActor};
 
 pub use self::live::SyncEvent;
@@ -69,7 +68,6 @@ impl Engine {
         default_author_storage: DefaultAuthorStorage,
     ) -> anyhow::Result<Self> {
         let (live_actor_tx, to_live_actor_recv) = mpsc::channel(ACTOR_CHANNEL_CAP);
-        let (to_gossip_actor, to_gossip_actor_recv) = mpsc::channel(ACTOR_CHANNEL_CAP);
         let me = endpoint.node_id().fmt_short();
 
         let content_status_cb = {
@@ -86,17 +84,10 @@ impl Engine {
             downloader,
             to_live_actor_recv,
             live_actor_tx.clone(),
-            to_gossip_actor,
-        );
-        let gossip_actor = GossipActor::new(
-            to_gossip_actor_recv,
-            sync.clone(),
-            gossip,
-            live_actor_tx.clone(),
         );
         let actor_handle = tokio::task::spawn(
             async move {
-                if let Err(err) = actor.run(gossip_actor).await {
+                if let Err(err) = actor.run().await {
                     error!("sync actor failed: {err:?}");
                 }
             }