From 3beb41c25c190cda8b4a01876f56a7d6c6a5cca7 Mon Sep 17 00:00:00 2001 From: patrini32 <171664803+patrini32@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:21:47 +0300 Subject: [PATCH] Throw appealing error in case that cancel timelock hasnt expired yet --- swap/src/cli/cancel_and_refund.rs | 2 +- ...d_using_cancel_and_refund_command_timelock_not_expired.rs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/swap/src/cli/cancel_and_refund.rs b/swap/src/cli/cancel_and_refund.rs index 1b55317d..7b773e1e 100644 --- a/swap/src/cli/cancel_and_refund.rs +++ b/swap/src/cli/cancel_and_refund.rs @@ -75,7 +75,7 @@ pub async fn cancel( if let ExpiredTimelocks::None { .. } = state6.expired_timelock(bitcoin_wallet.as_ref()).await? { - tracing::info!("Cancel timelock hasn't expired yet."); + bail!("Cancel timelock hasn't expired yet"); } if let Ok(error_code) = parse_rpc_error_code(&err) { tracing::debug!(%error_code, "parse rpc error"); diff --git a/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs b/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs index 16953866..11eb2f0b 100644 --- a/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs +++ b/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs @@ -42,10 +42,7 @@ async fn given_alice_and_bob_manually_cancel_when_timelock_not_expired_errors() let error = cli::cancel(bob_swap.id, bob_swap.bitcoin_wallet, bob_swap.db) .await .unwrap_err(); - assert_eq!( - parse_rpc_error_code(&error).unwrap(), - i64::from(RpcErrorCode::RpcVerifyRejected) - ); + assert_eq!(error.to_string(), "Cancel timelock hasn't expired yet"); ctx.restart_alice().await; let alice_swap = ctx.alice_next_swap().await;