refactor: use seperate actors for sync and gossip

iroh-gossip/src/net.rs

@@ -259,9 +259,9 @@ impl Gossip {
 ///
 /// TODO: Optionally resolve to an error once all connection attempts failed.
 #[derive(Debug)]
-pub struct JoinTopicFut(oneshot::Receiver<anyhow::Result<()>>);
+pub struct JoinTopicFut(oneshot::Receiver<anyhow::Result<TopicId>>);
 impl Future for JoinTopicFut {
-    type Output = anyhow::Result<()>;
+    type Output = anyhow::Result<TopicId>;
 
     fn poll(
         mut self: std::pin::Pin<&mut Self>,
@@ -293,7 +293,7 @@ enum ToActor {
     Join(
         TopicId,
         Vec<PublicKey>,
-        #[debug(skip)] oneshot::Sender<anyhow::Result<()>>,
+        #[debug(skip)] oneshot::Sender<anyhow::Result<TopicId>>,
     ),
     /// Leave a topic, send disconnect messages and drop all state.
     Quit(TopicId),
@@ -453,12 +453,13 @@ impl Actor {
                     .await?;
                 if self.state.has_active_peers(&topic_id) {
                     // If the active_view contains at least one peer, reply now
-                    reply.send(Ok(())).ok();
+                    reply.send(Ok(topic_id)).ok();
                 } else {
                     // Otherwise, wait for any peer to come up as neighbor.
                     let sub = self.subscribe(topic_id);
                     tokio::spawn(async move {
                         let res = wait_for_neighbor_up(sub).await;
+                        let res = res.map(|_| topic_id);
                         reply.send(res).ok();
                     });
                 }

iroh-sync/Cargo.toml

@@ -26,6 +26,7 @@ postcard = { version = "1", default-features = false, features = ["alloc", "use-
 rand = "0.8.5"
 rand_core = "0.6.4"
 serde = { version = "1.0.164", features = ["derive"] }
+strum = { version = "0.25", features = ["derive"] }
 url = "2.4"
 bytes = "1"
 parking_lot = "0.12.1"