From cacfc50fb217aaee3e0f8e5e5ffc39246552773a Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Thu, 8 Jul 2021 12:14:30 +1000 Subject: [PATCH] Don't spam the user while waiting for BTC --- swap/src/bin/swap.rs | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/swap/src/bin/swap.rs b/swap/src/bin/swap.rs index d5036dc2..1e591f0d 100644 --- a/swap/src/bin/swap.rs +++ b/swap/src/bin/swap.rs @@ -446,28 +446,26 @@ where "Waiting for Bitcoin deposit", ); - sync().await?; + max_giveable = loop { + sync().await?; + let new_max_givable = max_giveable_fn().await?; - let new_max_givable = max_giveable_fn().await?; + if new_max_givable > max_giveable { + break new_max_givable; + } - if new_max_givable != max_giveable { - max_giveable = new_max_givable; + tokio::time::sleep(Duration::from_secs(1)).await; + }; - let new_balance = balance().await?; - tracing::info!( - %new_balance, - %max_giveable, - "Received Bitcoin", - ); + let new_balance = balance().await?; + tracing::info!(%new_balance, %max_giveable, "Received Bitcoin"); - if max_giveable >= bid_quote.min_quantity { - break; - } else { - tracing::info!("Deposited amount is less than `min_quantity`",); - } + if max_giveable < bid_quote.min_quantity { + tracing::info!("Deposited amount is less than `min_quantity`"); + continue; } - tokio::time::sleep(Duration::from_secs(1)).await; + break; } };