Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-11-29 12:06:35 -05:00
Code Issues Projects Releases Packages Wiki Activity

Do a bunch of cleanups

Browse source
This commit is contained in:
Tobin C. Harding 2020-10-22 14:30:10 +11:00
parent 6e34f9c978
commit 19f065575d
7 changed files with 76 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

9
swap/src/bitcoin.rs
View file

@ -1,16 +1,19 @@
use anyhow::Result;
use async_trait::async_trait;
use backoff::{future::FutureOperation as _, ExponentialBackoff};
use bitcoin::{util::psbt::PartiallySignedTransaction, Address, Amount, Transaction, Txid};
use bitcoin::{util::psbt::PartiallySignedTransaction, Address, Transaction};
use bitcoin_harness::bitcoind_rpc::PsbtBase64;
use reqwest::Url;
use xmr_btc::{
bitcoin::{
BroadcastSignedTransaction, BuildTxLockPsbt, SignTxLock, TxLock, WatchForRawTransaction,
Amount, BroadcastSignedTransaction, BuildTxLockPsbt, SignTxLock, TxLock, Txid,
WatchForRawTransaction,
},
MedianTime,
};
// This is cut'n'paste from xmr_btc/tests/harness/wallet/bitcoin.rs
#[derive(Debug)]
pub struct Wallet(pub bitcoin_harness::Wallet);
@ -37,8 +40,6 @@ impl Wallet {
.await
.map(|res| bitcoin::Amount::from_btc(-res.fee))??;
// FIXME: Handle re-export of bitcoin::Amount correctly.
let fee = Amount::from_sat(fee.as_sat());
Ok(fee)
}
}