Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-04-20 16:06:00 -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 15:45:27 +02:00
parent fa65984e00
commit b98445f9a8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@ pub async fn cancel(
// The cancel transaction has not been published yet and we failed to publish it ourselves
// Here we try to figure out why
match state6.expired_timelock(bitcoin_wallet.as_ref()).await {
// We cannot cancel because Alice has already cancelled and punished afterwards
Ok(ExpiredTimelocks::Punish { .. }) => {
let state = BobState::BtcPunished {
tx_lock_id: state6.tx_lock_id(),
@ -87,6 +88,7 @@ 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 { .. }) => {
bail!(err.context(
"Cannot cancel swap because the cancel timelock has not expired yet"
@ -96,7 +98,9 @@ pub async fn cancel(
bail!(err.context("Failed to cancel swap even though cancel timelock has expired. This is unexpected."));
}
Err(timelock_err) => {
bail!(err.context(format!("Failed to check timelock status: {}", timelock_err)))
bail!(err
.context(timelock_err)
.context("Failed to cancel swap and could not check timelock status"));
}
}
}