From 9811136b05b1d3fc81d628555cf35025b24f0a3a Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Thu, 18 Nov 2021 16:20:57 +1100
Subject: [PATCH 1/3] Remove duplicate message

This is already logged in the connection actor.
---
 daemon/src/taker_cfd.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/daemon/src/taker_cfd.rs b/daemon/src/taker_cfd.rs
index 2887816..92efb93 100644
--- a/daemon/src/taker_cfd.rs
+++ b/daemon/src/taker_cfd.rs
@@ -740,7 +740,6 @@ where
         + xtra::Handler<wallet::BuildPartyParams>,
 {
     async fn handle(&mut self, msg: wire::MakerToTaker, ctx: &mut Context<Self>) {
-        tracing::trace!("message from maker: {:?}", msg);
         match msg {
             wire::MakerToTaker::Heartbeat => {
                 unreachable!("Heartbeats should be handled somewhere else")

From 07ebb086069e639f3d99c84a98276586250e6ba7 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Thu, 18 Nov 2021 17:03:27 +1100
Subject: [PATCH 2/3] Transition uses of `do_send` to `send`

`do_send` on `MessageChannel` suffers from the same problems as
`Address#do_send` and `Address#do_send_async`.

Our uses only send messages that never fail so we don't need to adjust
anything.
---
 daemon/src/fan_out.rs   |  9 ++++-----
 daemon/src/taker_cfd.rs | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/daemon/src/fan_out.rs b/daemon/src/fan_out.rs
index b6834d2..c2cfa16 100644
--- a/daemon/src/fan_out.rs
+++ b/daemon/src/fan_out.rs
@@ -22,11 +22,10 @@ where
 {
     async fn handle(&mut self, message: M, _: &mut xtra::Context<Self>) {
         for receiver in &self.receivers {
-            // Not sure why here is no `do_send_async` ...
-            if receiver.do_send(message.clone()).is_err() {
-                tracing::error!(
-                    "Fan out actor was unable to send to other actor - we should never see this."
-                )
+            if receiver.send(message.clone()).await.is_err() {
+                // Should ideally remove from list but that is unnecessarily hard with Rust
+                // iterators
+                tracing::error!("Actor disconnected, cannot send message");
             }
         }
     }
diff --git a/daemon/src/taker_cfd.rs b/daemon/src/taker_cfd.rs
index 92efb93..f6b3f86 100644
--- a/daemon/src/taker_cfd.rs
+++ b/daemon/src/taker_cfd.rs
@@ -167,7 +167,8 @@ impl<O, M, W> Actor<O, M, W> {
         self.order_feed_actor_inbox.send(None)?;
 
         self.send_to_maker
-            .do_send(wire::TakerToMaker::TakeOrder { order_id, quantity })?;
+            .send(wire::TakerToMaker::TakeOrder { order_id, quantity })
+            .await?;
 
         Ok(())
     }
@@ -221,13 +222,14 @@ where
         self.send_pending_update_proposals()?;
 
         self.send_to_maker
-            .do_send(wire::TakerToMaker::ProposeSettlement {
+            .send(wire::TakerToMaker::ProposeSettlement {
                 order_id: proposal.order_id,
                 timestamp: proposal.timestamp,
                 taker: proposal.taker,
                 maker: proposal.maker,
                 price: proposal.price,
-            })?;
+            })
+            .await?;
         Ok(())
     }
 
@@ -381,10 +383,11 @@ where
         self.send_pending_update_proposals()?;
 
         self.send_to_maker
-            .do_send(wire::TakerToMaker::ProposeRollOver {
+            .send(wire::TakerToMaker::ProposeRollOver {
                 order_id: proposal.order_id,
                 timestamp: proposal.timestamp,
-            })?;
+            })
+            .await?;
         Ok(())
     }
 }
@@ -667,10 +670,11 @@ where
         let (tx, sig_taker) = dlc.close_transaction(proposal)?;
 
         self.send_to_maker
-            .do_send(wire::TakerToMaker::InitiateSettlement {
+            .send(wire::TakerToMaker::InitiateSettlement {
                 order_id,
                 sig_taker,
-            })?;
+            })
+            .await?;
 
         cfd.handle(CfdStateChangeEvent::ProposalSigned(
             CollaborativeSettlement::new(

From f43e8a5e25e9378ee213ad3759c1012dd427508c Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Thu, 18 Nov 2021 17:04:33 +1100
Subject: [PATCH 3/3] Ban use of `do_send` function via clippy

---
 clippy.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/clippy.toml b/clippy.toml
index 32bfb77..53c8b2c 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1,4 +1,5 @@
 disallowed-methods = [
   "xtra::Address::do_send_async", # discards the return value, possibly swallowing an error
   "xtra::Address::do_send", # discards the return value, possibly swallowing an error
+  "xtra::message_channel::MessageChannel::do_send", # discards the return value, possibly swallowing an error
 ]