Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-04-20 07:56:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update cancel_and_refund.rs

Browse Source
This commit is contained in:
binarybaron 2024-06-27 17:23:31 +02:00
parent 9460b2a732
commit a6d8a2930c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swap/src/cli/cancel_and_refund.rs
View File

@ -71,7 +71,7 @@ pub async fn cancel(
let state = BobState::BtcCancelled(state6);
db.insert_latest_state(swap_id, state.clone().into())
.await?;
tracing::info!("Cancel transaction has already been published by Alice");
tracing::info!("Alice has already cancelled the swap");
return Ok((tx.txid(), state));
}
@ -89,9 +89,12 @@ pub async fn cancel(
bail!(err.context("Cannot cancel swap because we have already been punished"));
}
// We cannot cancel because the cancel timelock has not expired yet
Ok(ExpiredTimelocks::None { .. }) => {
Ok(ExpiredTimelocks::None { blocks_left }) => {
bail!(err.context(
"Cannot cancel swap because the cancel timelock has not expired yet"
format!(
"Cannot cancel swap because the cancel timelock has not expired yet. Blocks left: {}",
blocks_left
)
));
}
Ok(ExpiredTimelocks::Cancel { .. }) => {