Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

next_state loop always exits in final state

Browse Source 
Otherwise we can run into scenarios where the loop never properly exits.
This commit is contained in:
Daniel Karzel 2021-03-31 12:20:51 +11:00 committed by Thomas Eizinger
parent d90496931b
commit e6dd194f77
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
swap/src/protocol/alice/swap.rs
View File

@ -8,37 +8,22 @@ use crate::protocol::alice::AliceState;
use crate::protocol::alice::AliceState::XmrLockTransferProofSent; use crate::protocol::alice::AliceState::XmrLockTransferProofSent;
use crate::{bitcoin, database, monero}; use crate::{bitcoin, database, monero};
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use rand::{CryptoRng, RngCore};
use tokio::select; use tokio::select;
use tokio::time::timeout; use tokio::time::timeout;
use tracing::{error, info}; use tracing::{error, info};
trait Rng: RngCore + CryptoRng + Send {}
impl<T> Rng for T where T: RngCore + CryptoRng + Send {}
pub fn is_complete(state: &AliceState) -> bool {
matches!(
state,
AliceState::XmrRefunded
| AliceState::BtcRedeemed
| AliceState::BtcPunished
| AliceState::SafelyAborted
)
}
pub async fn run(swap: alice::Swap) -> Result<AliceState> { pub async fn run(swap: alice::Swap) -> Result<AliceState> {
run_until(swap, is_complete).await run_until(swap, |_| false).await
} }
#[tracing::instrument(name = "swap", skip(swap,is_target_state), fields(id = %swap.swap_id))] #[tracing::instrument(name = "swap", skip(swap,exit_early), fields(id = %swap.swap_id))]
pub async fn run_until( pub async fn run_until(
mut swap: alice::Swap, mut swap: alice::Swap,
is_target_state: fn(&AliceState) -> bool, exit_early: fn(&AliceState) -> bool,
) -> Result<AliceState> { ) -> Result<AliceState> {
let mut current_state = swap.state; let mut current_state = swap.state;
while !is_target_state(&current_state) { while !is_complete(&current_state) && !exit_early(&current_state) {
current_state = next_state( current_state = next_state(
current_state, current_state,
&mut swap.event_loop_handle, &mut swap.event_loop_handle,
@ -372,3 +357,13 @@ async fn next_state(
AliceState::SafelyAborted => AliceState::SafelyAborted, AliceState::SafelyAborted => AliceState::SafelyAborted,
}) })
} }
fn is_complete(state: &AliceState) -> bool {
matches!(
state,
AliceState::XmrRefunded
| AliceState::BtcRedeemed
| AliceState::BtcPunished
| AliceState::SafelyAborted
)
}