From a53a420794a4449a49492776360530926d7782c4 Mon Sep 17 00:00:00 2001 From: binarybaron <86064887+binarybaron@users.noreply.github.com> Date: Mon, 6 Nov 2023 16:05:32 +0100 Subject: [PATCH] Remove unnecessary swap suspension listener from determine_btc_to_swap call in BuyXmr --- swap/src/api/request.rs | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/swap/src/api/request.rs b/swap/src/api/request.rs index 061f8f67..9e25b78d 100644 --- a/swap/src/api/request.rs +++ b/swap/src/api/request.rs @@ -368,23 +368,14 @@ impl Request { estimate_fee, ); - let (amount, fees) = tokio::select! { - biased; - _ = context.swap_lock.listen_for_swap_force_suspension() => { - tracing::debug!("Shutdown signal received, exiting"); - bail!("Shutdown signal received"); - }, - result = determine_amount => { - match result { - Ok(val) => val, - Err(error) => match error.downcast::() { - Ok(_) => { - bail!("Seller's XMR balance is currently too low to initiate a swap, please try again later") - } - Err(other) => bail!(other), - }, + let (amount, fees) = match determine_amount.await { + Ok(val) => val, + Err(error) => match error.downcast::() { + Ok(_) => { + bail!("Seller's XMR balance is currently too low to initiate a swap, please try again later") } - } + Err(other) => bail!(other), + }, }; tracing::info!(%amount, %fees, "Determined swap amount");