From 1d21ae7e7abda35f1f4004f6d2313f0e4bd7746e Mon Sep 17 00:00:00 2001 From: Lucas Soriano del Pino Date: Mon, 26 Oct 2020 11:36:52 +1100 Subject: [PATCH] Use pin_mut! instead of futures::pin_mut! --- xmr-btc/src/alice.rs | 6 +++--- xmr-btc/src/bob.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xmr-btc/src/alice.rs b/xmr-btc/src/alice.rs index 50734c69..06d0bca9 100644 --- a/xmr-btc/src/alice.rs +++ b/xmr-btc/src/alice.rs @@ -13,7 +13,7 @@ use ecdsa_fun::{ }; use futures::{ future::{select, Either}, - FutureExt, + pin_mut, FutureExt, }; use genawaiter::sync::{Gen, GenBoxed}; use rand::{CryptoRng, RngCore}; @@ -138,7 +138,7 @@ where tx_lock_height + refund_timelock, ) .shared(); - futures::pin_mut!(poll_until_btc_has_expired); + pin_mut!(poll_until_btc_has_expired); let S_a = monero::PublicKey::from_private_key(&monero::PrivateKey { scalar: s_a.into_ed25519(), @@ -233,7 +233,7 @@ where tx_lock_height + refund_timelock + punish_timelock, ) .shared(); - futures::pin_mut!(poll_until_bob_can_be_punished); + pin_mut!(poll_until_bob_can_be_punished); let tx_cancel = bitcoin::TxCancel::new(&tx_lock, refund_timelock, a.public(), B.clone()); diff --git a/xmr-btc/src/bob.rs b/xmr-btc/src/bob.rs index 8751e9c0..9b6efb36 100644 --- a/xmr-btc/src/bob.rs +++ b/xmr-btc/src/bob.rs @@ -17,7 +17,7 @@ use ecdsa_fun::{ }; use futures::{ future::{select, Either}, - FutureExt, + pin_mut, FutureExt, }; use genawaiter::sync::{Gen, GenBoxed}; use rand::{CryptoRng, RngCore}; @@ -139,7 +139,7 @@ where tx_lock_height + refund_timelock, ) .shared(); - futures::pin_mut!(poll_until_btc_has_expired); + pin_mut!(poll_until_btc_has_expired); let transfer_proof = match select( network.receive_transfer_proof(),