From 8f50eb2f3498c0457b84e636af75efba7ae1075c Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Wed, 7 Jul 2021 14:31:10 +1000
Subject: [PATCH] Utilize tracing's fields more

---
 swap/src/network/tor_transport.rs | 2 +-
 swap/src/protocol/alice/swap.rs   | 4 ++--
 swap/src/protocol/bob/swap.rs     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/swap/src/network/tor_transport.rs b/swap/src/network/tor_transport.rs
index 786056d8..04484cd3 100644
--- a/swap/src/network/tor_transport.rs
+++ b/swap/src/network/tor_transport.rs
@@ -42,7 +42,7 @@ impl Transport for TorDialOnlyTransport {
         }
 
         let dial_future = async move {
-            tracing::trace!("Connecting through Tor proxy to address {}", addr);
+            tracing::trace!(address = %addr, "Establishing connection through Tor proxy");
 
             let stream =
                 Socks5Stream::connect((Ipv4Addr::LOCALHOST, self.socks_port), address.to_string())
diff --git a/swap/src/protocol/alice/swap.rs b/swap/src/protocol/alice/swap.rs
index b7765a38..b09658f0 100644
--- a/swap/src/protocol/alice/swap.rs
+++ b/swap/src/protocol/alice/swap.rs
@@ -246,8 +246,8 @@ where
                     Err(error) => {
                         tracing::error!("Failed to construct redeem transaction: {:#}", error);
                         tracing::info!(
-                            "Waiting for cancellation timelock ({}) to expire",
-                            state3.cancel_timelock
+                            timelock = %state3.cancel_timelock,
+                            "Waiting for cancellation timelock to expire",
                         );
 
                         tx_lock_status
diff --git a/swap/src/protocol/bob/swap.rs b/swap/src/protocol/bob/swap.rs
index cbff1c71..0ebab92b 100644
--- a/swap/src/protocol/bob/swap.rs
+++ b/swap/src/protocol/bob/swap.rs
@@ -150,8 +150,8 @@ async fn next_state(
                         match received_xmr {
                             Ok(()) => BobState::XmrLocked(state.xmr_locked(monero_wallet_restore_blockheight)),
                             Err(monero::InsufficientFunds { expected, actual }) => {
-                                tracing::warn!("Insufficient Monero have been locked! Expected {} but got {}", expected, actual);
-                                tracing::info!("Waiting for cancel timelock ({}) to expire", state.cancel_timelock);
+                                tracing::warn!(%expected, %actual, "Insufficient Monero have been locked!");
+                                tracing::info!(timelock = %state.cancel_timelock, "Waiting for cancel timelock to expire");
 
                                 tx_lock_status.wait_until_confirmed_with(state.cancel_timelock).await?;