From 53aae5cf5fa402068449a656426658c3d7e985b6 Mon Sep 17 00:00:00 2001
From: Franck Royer <franck@coblox.tech>
Date: Thu, 10 Dec 2020 13:49:38 +1100
Subject: [PATCH] Use anyhow macro as intended

---
 swap/src/alice/event_loop.rs | 19 ++++++++++---------
 swap/src/bob/event_loop.rs   | 10 +++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/swap/src/alice/event_loop.rs b/swap/src/alice/event_loop.rs
index 52320ba7..cd69d641 100644
--- a/swap/src/alice/event_loop.rs
+++ b/swap/src/alice/event_loop.rs
@@ -3,7 +3,7 @@ use crate::{
     network::{request_response::AliceToBob, transport::SwapTransport, TokioExecutor},
     SwapAmounts,
 };
-use anyhow::{Context, Result};
+use anyhow::{anyhow, Context, Result};
 use futures::FutureExt;
 use libp2p::{
     core::Multiaddr, futures::StreamExt, request_response::ResponseChannel, PeerId, Swarm,
@@ -46,41 +46,42 @@ impl EventLoopHandle {
         self.conn_established
             .recv()
             .await
-            .ok_or_else(|| anyhow::Error::msg("Failed to receive connection established from Bob"))
+            .ok_or_else(|| anyhow!("Failed to receive connection established from Bob"))
     }
 
     pub async fn recv_message0(&mut self) -> Result<bob::Message0> {
         self.msg0
             .recv()
             .await
-            .ok_or_else(|| anyhow::Error::msg("Failed to receive message 0 from Bob"))
+            .ok_or_else(|| anyhow!("Failed to receive message 0 from Bob"))
     }
 
     pub async fn recv_message1(&mut self) -> Result<(bob::Message1, ResponseChannel<AliceToBob>)> {
         self.msg1
             .recv()
             .await
-            .ok_or_else(|| anyhow::Error::msg("Failed to receive message 1 from Bob"))
+            .ok_or_else(|| anyhow!("Failed to receive message 1 from Bob"))
     }
 
     pub async fn recv_message2(&mut self) -> Result<(bob::Message2, ResponseChannel<AliceToBob>)> {
         self.msg2
             .recv()
             .await
-            .ok_or_else(|| anyhow::Error::msg("Failed o receive message 2 from Bob"))
+            .ok_or_else(|| anyhow!("Failed o receive message 2 from Bob"))
     }
 
     pub async fn recv_message3(&mut self) -> Result<bob::Message3> {
-        self.msg3.recv().await.ok_or_else(|| {
-            anyhow::Error::msg("Failed to receive Bitcoin encrypted signature from Bob")
-        })
+        self.msg3
+            .recv()
+            .await
+            .ok_or_else(|| anyhow!("Failed to receive Bitcoin encrypted signature from Bob"))
     }
 
     pub async fn recv_request(&mut self) -> Result<crate::alice::amounts::OutEvent> {
         self.request
             .recv()
             .await
-            .ok_or_else(|| anyhow::Error::msg("Failed to receive amounts request from Bob"))
+            .ok_or_else(|| anyhow!("Failed to receive amounts request from Bob"))
     }
 
     pub async fn send_amounts(
diff --git a/swap/src/bob/event_loop.rs b/swap/src/bob/event_loop.rs
index 3295fe8a..28f3b833 100644
--- a/swap/src/bob/event_loop.rs
+++ b/swap/src/bob/event_loop.rs
@@ -2,7 +2,7 @@ use crate::{
     bob::{Behaviour, OutEvent},
     network::{transport::SwapTransport, TokioExecutor},
 };
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use futures::FutureExt;
 use libp2p::{core::Multiaddr, PeerId};
 use tokio::{
@@ -48,28 +48,28 @@ impl EventLoopHandle {
         self.conn_established
             .recv()
             .await
-            .ok_or_else(|| anyhow::Error::msg("Failed to receive connection established from Bob"))
+            .ok_or_else(|| anyhow!("Failed to receive connection established from Bob"))
     }
 
     pub async fn recv_message0(&mut self) -> Result<alice::Message0> {
         self.msg0
             .recv()
             .await
-            .ok_or_else(|| anyhow::Error::msg("Failed to receive message 0 from Bob"))
+            .ok_or_else(|| anyhow!("Failed to receive message 0 from Bob"))
     }
 
     pub async fn recv_message1(&mut self) -> Result<alice::Message1> {
         self.msg1
             .recv()
             .await
-            .ok_or_else(|| anyhow::Error::msg("Failed to receive message 1 from Bob"))
+            .ok_or_else(|| anyhow!("Failed to receive message 1 from Bob"))
     }
 
     pub async fn recv_message2(&mut self) -> Result<alice::Message2> {
         self.msg2
             .recv()
             .await
-            .ok_or_else(|| anyhow::Error::msg("Failed o receive message 2 from Bob"))
+            .ok_or_else(|| anyhow!("Failed o receive message 2 from Bob"))
     }
 
     pub async fn dial_alice(&mut self, addr: Multiaddr) -> Result<()> {