From ca2e00e3f0c0e24222c5c1124fbff3db019396fe Mon Sep 17 00:00:00 2001
From: patrini32 <171664803+patrini32@users.noreply.github.com>
Date: Wed, 5 Jun 2024 15:46:48 +0300
Subject: [PATCH] refactor and print successful refund message only if it
 succeeded

---
 swap/src/cli/cancel_and_refund.rs                            | 5 +++--
 ...alice_manually_punishes_after_bob_dead_and_bob_cancels.rs | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/swap/src/cli/cancel_and_refund.rs b/swap/src/cli/cancel_and_refund.rs
index f370b9c0..9ac26d97 100644
--- a/swap/src/cli/cancel_and_refund.rs
+++ b/swap/src/cli/cancel_and_refund.rs
@@ -19,8 +19,9 @@ pub async fn cancel_and_refund(
         Ok(s) => s,
         Err(e) => bail!(e),
     };
-
-    tracing::info!("Refund transaction submitted");
+    if matches!(state, BobState::BtcRefunded { .. }) {
+        tracing::info!("Refund transaction submitted");
+    }
     Ok(state)
 }
 
diff --git a/swap/tests/alice_manually_punishes_after_bob_dead_and_bob_cancels.rs b/swap/tests/alice_manually_punishes_after_bob_dead_and_bob_cancels.rs
index 84b1ef7f..739df338 100644
--- a/swap/tests/alice_manually_punishes_after_bob_dead_and_bob_cancels.rs
+++ b/swap/tests/alice_manually_punishes_after_bob_dead_and_bob_cancels.rs
@@ -73,7 +73,7 @@ async fn alice_manually_punishes_after_bob_dead_and_bob_cancels() {
         let (bob_swap, _) = ctx
             .stop_and_resume_bob_from_db(bob_join_handle, bob_swap_id)
             .await;
-
+        assert!(matches!(bob_swap.state, BobState::BtcLocked { .. }));
         let state =
             cli::cancel_and_refund(bob_swap_id, bob_swap.bitcoin_wallet, bob_swap.db).await?;
         ctx.assert_bob_punished(state).await;