Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-18 04:14:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use pin_mut! instead of futures::pin_mut!

Browse Source
This commit is contained in:
Lucas Soriano del Pino 2020-10-26 11:36:52 +11:00
parent aa2a20916e
commit 1d21ae7e7a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xmr-btc/src/alice.rs
View File

@ -13,7 +13,7 @@ use ecdsa_fun::{
}; };
use futures::{ use futures::{
future::{select, Either}, future::{select, Either},
FutureExt, pin_mut, FutureExt,
}; };
use genawaiter::sync::{Gen, GenBoxed}; use genawaiter::sync::{Gen, GenBoxed};
use rand::{CryptoRng, RngCore}; use rand::{CryptoRng, RngCore};
@ -138,7 +138,7 @@ where
tx_lock_height + refund_timelock, tx_lock_height + refund_timelock,
) )
.shared(); .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 { let S_a = monero::PublicKey::from_private_key(&monero::PrivateKey {
scalar: s_a.into_ed25519(), scalar: s_a.into_ed25519(),
@ -233,7 +233,7 @@ where
tx_lock_height + refund_timelock + punish_timelock, tx_lock_height + refund_timelock + punish_timelock,
) )
.shared(); .shared();
futures::pin_mut!(poll_until_bob_can_be_punished); pin_mut!(poll_until_bob_can_be_punished);
let tx_cancel = let tx_cancel =
bitcoin::TxCancel::new(&tx_lock, refund_timelock, a.public(), B.clone()); bitcoin::TxCancel::new(&tx_lock, refund_timelock, a.public(), B.clone());

4
xmr-btc/src/bob.rs
View File

@ -17,7 +17,7 @@ use ecdsa_fun::{
}; };
use futures::{ use futures::{
future::{select, Either}, future::{select, Either},
FutureExt, pin_mut, FutureExt,
}; };
use genawaiter::sync::{Gen, GenBoxed}; use genawaiter::sync::{Gen, GenBoxed};
use rand::{CryptoRng, RngCore}; use rand::{CryptoRng, RngCore};
@ -139,7 +139,7 @@ where
tx_lock_height + refund_timelock, tx_lock_height + refund_timelock,
) )
.shared(); .shared();
futures::pin_mut!(poll_until_btc_has_expired); pin_mut!(poll_until_btc_has_expired);
let transfer_proof = match select( let transfer_proof = match select(
network.receive_transfer_proof(), network.receive_transfer_proof(),