Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove Arcs in favour of references

Browse Source
This commit is contained in:
Daniel Karzel 2021-03-03 16:42:05 +11:00
parent 0b4c0758bb
commit 2e3c2d8edf
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monero-rpc/src/rpc/wallet.rs
View File

@ -147,7 +147,7 @@ impl Client {
Ok(()) Ok(())
} }
/// Opens a wallet using `filename`. /// Close the currently opened wallet, after trying to save it.
pub async fn close_wallet(&self) -> Result<()> { pub async fn close_wallet(&self) -> Result<()> {
let request = Request::new("close_wallet", ""); let request = Request::new("close_wallet", "");

8
swap/src/protocol/alice/steps.rs
View File

@ -22,7 +22,6 @@ use futures::{
}; };
use libp2p::PeerId; use libp2p::PeerId;
use sha2::Sha256; use sha2::Sha256;
use std::sync::Arc;
use tokio::time::timeout; use tokio::time::timeout;
// TODO(Franck): Use helper functions from xmr-btc instead of re-writing them // TODO(Franck): Use helper functions from xmr-btc instead of re-writing them
@ -52,7 +51,7 @@ pub async fn lock_xmr(
bob_peer_id: PeerId, bob_peer_id: PeerId,
state3: alice::State3, state3: alice::State3,
event_loop_handle: &mut EventLoopHandle, event_loop_handle: &mut EventLoopHandle,
monero_wallet: Arc<monero::Wallet>, monero_wallet: &monero::Wallet,
) -> Result<()> { ) -> Result<()> {
let S_a = monero::PublicKey::from_private_key(&monero::PrivateKey { scalar: state3.s_a }); let S_a = monero::PublicKey::from_private_key(&monero::PrivateKey { scalar: state3.s_a });
@ -126,14 +125,13 @@ pub async fn publish_cancel_transaction(
B: bitcoin::PublicKey, B: bitcoin::PublicKey,
cancel_timelock: CancelTimelock, cancel_timelock: CancelTimelock,
tx_cancel_sig_bob: bitcoin::Signature, tx_cancel_sig_bob: bitcoin::Signature,
bitcoin_wallet: Arc<bitcoin::Wallet>, bitcoin_wallet: &bitcoin::Wallet,
) -> Result<bitcoin::TxCancel> { ) -> Result<bitcoin::TxCancel> {
// First wait for cancel timelock to expire // First wait for cancel timelock to expire
let tx_lock_height = bitcoin_wallet let tx_lock_height = bitcoin_wallet
.transaction_block_height(tx_lock.txid()) .transaction_block_height(tx_lock.txid())
.await?; .await?;
poll_until_block_height_is_gte(bitcoin_wallet.as_ref(), tx_lock_height + cancel_timelock) poll_until_block_height_is_gte(&bitcoin_wallet, tx_lock_height + cancel_timelock).await?;
.await?;
let tx_cancel = bitcoin::TxCancel::new(&tx_lock, cancel_timelock, a.public(), B); let tx_cancel = bitcoin::TxCancel::new(&tx_lock, cancel_timelock, a.public(), B);

4
swap/src/protocol/alice/swap.rs
View File

@ -130,7 +130,7 @@ async fn run_until_internal(
bob_peer_id, bob_peer_id,
*state3.clone(), *state3.clone(),
&mut event_loop_handle, &mut event_loop_handle,
monero_wallet.clone(), &monero_wallet,
) )
.await?; .await?;
@ -286,7 +286,7 @@ async fn run_until_internal(
state3.B, state3.B,
state3.cancel_timelock, state3.cancel_timelock,
state3.tx_cancel_sig_bob.clone(), state3.tx_cancel_sig_bob.clone(),
bitcoin_wallet.clone(), &bitcoin_wallet,
) )
.await?; .await?;