Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-24 14:15:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add --force flag for cancel and refund

Browse source
This commit is contained in:
Daniel Karzel 2021-02-01 22:32:54 +11:00
parent 02f8eb7f18
commit c930ad84a4
8 changed files with 118 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
swap/src/protocol/bob/refund.rs
View file

@ -4,7 +4,7 @@ use crate::{
execution_params::ExecutionParams,
protocol::bob::BobState,
};
use anyhow::Result;
use anyhow::{bail, Result};
use std::sync::Arc;
use uuid::Uuid;
@ -18,11 +18,28 @@ pub async fn refund(
execution_params: ExecutionParams,
bitcoin_wallet: Arc<Wallet>,
db: Database,
force: bool,
) -> Result<Result<BobState, SwapNotCancelledYet>> {
let state4 = match state {
BobState::BtcCancelled(state4) => state4,
_ => {
return Ok(Err(SwapNotCancelledYet(swap_id)));
let state4 = if force {
match state {
BobState::BtcLocked(state3) => state3.state4(),
BobState::XmrLockProofReceived { state, .. } => state.state4(),
BobState::XmrLocked(state4) => state4,
BobState::EncSigSent(state4) => state4,
BobState::CancelTimelockExpired(state4) => state4,
BobState::BtcCancelled(state4) => state4,
_ => bail!(
"Cannot refund swap {} because it is in state {} which is not refundable.",
swap_id,
state
),
}
} else {
match state {
BobState::BtcCancelled(state4) => state4,
_ => {
return Ok(Err(SwapNotCancelledYet(swap_id)));
}
}
};