Archives/xmr-btc-swap
2
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-11-17 15:26:14 +00:00
Code Issues Projects Releases Wiki Activity

Simplify the GET request to the tx status URL

Browse Source
This commit is contained in:
Thomas Eizinger 2021-03-05 16:49:49 +11:00
parent 418ad7089d
commit e9d7d9299c
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
swap/src/bitcoin/wallet.rs
View File

@ -246,25 +246,20 @@ impl Wallet {
} }
pub async fn transaction_block_height(&self, txid: Txid) -> Result<BlockHeight> { pub async fn transaction_block_height(&self, txid: Txid) -> Result<BlockHeight> {
let url = make_tx_status_url(&self.http_url, txid)?; let status_url = make_tx_status_url(&self.http_url, txid)?;
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
struct TransactionStatus { struct TransactionStatus {
block_height: Option<u32>, block_height: Option<u32>,
confirmed: bool, confirmed: bool,
} }
let height = retry(ConstantBackoff::new(Duration::from_secs(1)), || async { let height = retry(ConstantBackoff::new(Duration::from_secs(1)), || async {
let resp = reqwest::Client::new() let block_height = reqwest::get(status_url.clone())
.request(Method::GET, url.clone())
.send()
.await .await
.map_err(|err| backoff::Error::Transient(Error::Io(err)))?; .map_err(|err| backoff::Error::Transient(Error::Io(err)))?
.json::<TransactionStatus>()
let tx_status: TransactionStatus = resp
.json()
.await .await
.map_err(|err| backoff::Error::Permanent(Error::JsonDeserialization(err)))?; .map_err(|err| backoff::Error::Permanent(Error::JsonDeserialization(err)))?
let block_height = tx_status
.block_height .block_height
.ok_or(backoff::Error::Transient(Error::NotYetMined))?; .ok_or(backoff::Error::Transient(Error::NotYetMined))?;