use global executor and some fixes

2 files changed, 20 insertions, 11 deletions

diff --git a/common/src/lib.rs b/common/src/lib.rs
index 5317b3e..d58d10b 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -2,6 +2,7 @@
 use std::{
     future::Future,
     io::{self, Read, Write},
+    sync::Arc,
     thread,
 };
 
@@ -11,19 +12,21 @@ use serde::{Deserialize, Serialize};
 use serde_json::Deserializer;
 use smol::{
     channel::{self, Receiver, Sender},
-    future,
     stream::StreamExt,
-    Executor,
 };
 
 pub mod msg;
 pub mod msg_id;
 
-pub trait Handler {
+pub trait Handler: Send + Sync + 'static {
     type Body: Serialize + for<'a> Deserialize<'a> + Send + Clone;
 
     fn init(node_id: String, node_ids: Vec<String>, output: Output<Self::Body>) -> Self;
-    fn handle(&self, header: MessageHeader, body: Self::Body) -> impl Future<Output = ()> + Send;
+    fn handle(
+        &self,
+        header: MessageHeader,
+        body: Self::Body,
+    ) -> impl Future<Output = ()> + Send + '_;
 }
 
 pub fn run_server<H: Handler>() {
@@ -40,14 +43,16 @@ pub fn run_server<H: Handler>() {
         s.spawn(|| send_loop(io::stdout(), out_recv));
 
         // As we receive messages, spawn a future for each
-        let executor = Executor::new();
-        future::block_on(executor.run(async {
+        let handler = Arc::new(handler);
+        smol::block_on(async move {
             while let Some(msg) = inp_recv.next().await {
-                executor
-                    .spawn(handler.handle(msg.header, msg.body))
-                    .detach();
+                let handler = handler.clone();
+                smol::spawn(async move {
+                    handler.handle(msg.header, msg.body).await;
+                })
+                .detach();
             }
-        }));
+        });
     });
 }
 
diff --git a/echo/src/main.rs b/echo/src/main.rs
index fed0059..424a538 100644
--- a/echo/src/main.rs
+++ b/echo/src/main.rs
@@ -37,7 +37,11 @@ impl Handler for EchoHandler {
         EchoHandler { output }
     }
 
-    fn handle(&self, header: MessageHeader, body: Self::Body) -> impl Future<Output = ()> + Send {
+    fn handle(
+        &self,
+        header: MessageHeader,
+        body: Self::Body,
+    ) -> impl Future<Output = ()> + Send + '_ {
         async move {
             match body {
                 EchoBody::Echo { msg_id, echo } => {