From 2d8ede80e182241d7ddf86ff427882637ff17e08 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Fri, 19 Feb 2021 12:33:59 +1100 Subject: [PATCH] Use released version of backoff --- Cargo.lock | 5 +++-- swap/Cargo.toml | 2 +- swap/src/bitcoin/wallet.rs | 2 +- swap/src/monero/wallet.rs | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4148fd36..e1691b3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,8 +204,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backoff" -version = "0.2.2-alpha.0" -source = "git+https://github.com/ihrwein/backoff?rev=9d03992a83dfdc596be26276d4e5c5254a4b11a2#9d03992a83dfdc596be26276d4e5c5254a4b11a2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fe17f59a06fe8b87a6fc8bf53bb70b3aba76d7685f432487a68cd5552853625" dependencies = [ "futures-core", "getrandom 0.2.1", diff --git a/swap/Cargo.toml b/swap/Cargo.toml index cbec0f10..597e235f 100644 --- a/swap/Cargo.toml +++ b/swap/Cargo.toml @@ -16,7 +16,7 @@ anyhow = "1" async-recursion = "0.3.1" async-trait = "0.1" atty = "0.2" -backoff = { git = "https://github.com/ihrwein/backoff", rev = "9d03992a83dfdc596be26276d4e5c5254a4b11a2", features = ["tokio"] } +backoff = { version = "0.3", features = ["tokio"] } base64 = "0.12" bdk = { version = "0.4" } bitcoin = { version = "0.26", features = ["rand", "use-serde"] } diff --git a/swap/src/bitcoin/wallet.rs b/swap/src/bitcoin/wallet.rs index e37512af..c0a9d93e 100644 --- a/swap/src/bitcoin/wallet.rs +++ b/swap/src/bitcoin/wallet.rs @@ -9,7 +9,7 @@ use crate::{ use ::bitcoin::{util::psbt::PartiallySignedTransaction, Txid}; use anyhow::{anyhow, bail, Context, Result}; use async_trait::async_trait; -use backoff::{backoff::Constant as ConstantBackoff, tokio::retry}; +use backoff::{backoff::Constant as ConstantBackoff, future::retry}; use bdk::{ blockchain::{noop_progress, Blockchain, ElectrumBlockchain}, electrum_client::{self, Client, ElectrumApi}, diff --git a/swap/src/monero/wallet.rs b/swap/src/monero/wallet.rs index a53c06c3..06cc02e6 100644 --- a/swap/src/monero/wallet.rs +++ b/swap/src/monero/wallet.rs @@ -5,7 +5,7 @@ use crate::monero::{ use ::monero::{Address, Network, PrivateKey, PublicKey}; use anyhow::Result; use async_trait::async_trait; -use backoff::{backoff::Constant as ConstantBackoff, tokio::retry}; +use backoff::{backoff::Constant as ConstantBackoff, future::retry}; use bitcoin::hashes::core::sync::atomic::AtomicU32; use monero_harness::rpc::wallet; use std::{