Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-02-23 08:09:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: add is_complete to table, refactor

Browse Source
This commit is contained in:
binarybaron 2024-07-24 11:30:23 +02:00
parent c3fd7fb879
commit 769a30c239
No known key found for this signature in database
GPG Key ID: 99B75D3E1476A26E
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
swap/src/bin/asb.rs
View File

@ -240,14 +240,16 @@ async fn main() -> Result<()> {
"XMR AMOUNT", "XMR AMOUNT",
"EXCHANGE RATE", "EXCHANGE RATE",
"TRADING PARTNER PEER ID", "TRADING PARTNER PEER ID",
"COMPLETED",
]); ]);
let all_swaps = db.all().await?; let all_swaps = db.all().await?;
for (swap_id, state) in all_swaps { for (swap_id, state) in all_swaps {
if let Err(e) = async { if let Err(e) = async {
let latest_state: AliceState = state.try_into()?; let latest_state: AliceState = state.try_into()?;
let is_completed = is_complete(&latest_state);
if only_unfinished && is_complete(&latest_state) { if only_unfinished && is_completed {
return Ok::<_, anyhow::Error>(()); return Ok::<_, anyhow::Error>(());
} }
@ -265,11 +267,9 @@ async fn main() -> Result<()> {
let swap_start_date = db.get_swap_start_date(swap_id).await?; let swap_start_date = db.get_swap_start_date(swap_id).await?;
let peer_id = db.get_peer_id(swap_id).await?; let peer_id = db.get_peer_id(swap_id).await?;
let exchange_rate = format!( let exchange_rate =
"{} XMR/BTC", Decimal::from_f64(state3.btc.to_btc()).unwrap() / state3.xmr.as_xmr();
(Decimal::from_f64(state3.btc.to_btc()).unwrap() / state3.xmr.as_xmr()) let exchange_rate = format!("{} XMR/BTC", exchange_rate.round_dp(8));
.round_dp(8)
);
if json { if json {
tracing::info!( tracing::info!(
@ -280,6 +280,7 @@ async fn main() -> Result<()> {
xmr_amount = %state3.xmr, xmr_amount = %state3.xmr,
exchange_rate = %exchange_rate, exchange_rate = %exchange_rate,
trading_partner_peer_id = %peer_id, trading_partner_peer_id = %peer_id,
completed = is_completed,
"Found swap in database" "Found swap in database"
); );
} else { } else {
@ -291,6 +292,7 @@ async fn main() -> Result<()> {
state3.xmr.to_string(), state3.xmr.to_string(),
exchange_rate, exchange_rate,
peer_id.to_string(), peer_id.to_string(),
is_completed.to_string(),
]); ]);
} }