Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-24 23:19:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update swap.rs

Browse Source
This commit is contained in:
binarybaron 2024-07-03 20:12:22 +02:00
parent 26e66ce9b9
commit ef75019ac6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
swap/src/protocol/bob/swap.rs
View File

@ -17,12 +17,12 @@ pub fn is_complete(state: &BobState) -> bool {
) )
} }
// Checks if this is a state where we should exit after // Checks if this is a state where we should exit after reaching it
// but we don't want to prevent resuming the swap in this state // but we don't want to prevent resuming the swap in this state
// This is currently only used for the BtcPunished state because we might be able to // This is currently only used for the BtcPunished state because we might be able to
// recover from this state by attempting a cooperative XMR redeem but it might also fail. // recover from this state by attempting a cooperative XMR redeem but it might also fail.
// We want to avoid an infinite retry loop but also allow the user to retry manually by resuming the swap. // We want to avoid an infinite retry loop but also allow the user to retry manually by resuming the swap.
pub fn is_exit_early(state: &BobState) -> bool { pub fn is_run_at_most_once(state: &BobState) -> bool {
matches!(state, BobState::BtcPunished { .. }) matches!(state, BobState::BtcPunished { .. })
} }
@ -38,7 +38,7 @@ pub async fn run_until(
let mut current_state = swap.state.clone(); let mut current_state = swap.state.clone();
while !is_target_state(&current_state) { while !is_target_state(&current_state) {
current_state = next_state( let next_state = next_state(
swap.id, swap.id,
current_state.clone(), current_state.clone(),
&mut swap.event_loop_handle, &mut swap.event_loop_handle,
@ -50,12 +50,14 @@ pub async fn run_until(
.await?; .await?;
swap.db swap.db
.insert_latest_state(swap.id, current_state.clone().into()) .insert_latest_state(swap.id, next_state.clone().into())
.await?; .await?;
if is_exit_early(&current_state) { if is_run_at_most_once(&current_state) && next_state == current_state {
break; break;
} }
current_state = next_state;
} }
Ok(current_state) Ok(current_state)