From 683d565679de516ef456f5aaa0c5e798fd9cff6e Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Tue, 6 Jul 2021 18:34:09 +1000 Subject: [PATCH] Make variable naming consistent --- swap/src/protocol/bob.rs | 10 +++++----- swap/src/protocol/bob/swap.rs | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/swap/src/protocol/bob.rs b/swap/src/protocol/bob.rs index 347f86d8..37a70da9 100644 --- a/swap/src/protocol/bob.rs +++ b/swap/src/protocol/bob.rs @@ -20,7 +20,7 @@ pub struct Swap { pub monero_wallet: Arc, pub env_config: env::Config, pub id: Uuid, - pub receive_monero_address: monero::Address, + pub monero_receive_address: monero::Address, } impl Swap { @@ -32,7 +32,7 @@ impl Swap { monero_wallet: Arc, env_config: env::Config, event_loop_handle: cli::EventLoopHandle, - receive_monero_address: monero::Address, + monero_receive_address: monero::Address, btc_amount: bitcoin::Amount, ) -> Self { Self { @@ -43,7 +43,7 @@ impl Swap { monero_wallet, env_config, id, - receive_monero_address, + monero_receive_address, } } @@ -54,7 +54,7 @@ impl Swap { monero_wallet: Arc, env_config: env::Config, event_loop_handle: cli::EventLoopHandle, - receive_monero_address: monero::Address, + monero_receive_address: monero::Address, ) -> Result { let state = db.get_state(id)?.try_into_bob()?.into(); @@ -66,7 +66,7 @@ impl Swap { monero_wallet, env_config, id, - receive_monero_address, + monero_receive_address, }) } } diff --git a/swap/src/protocol/bob/swap.rs b/swap/src/protocol/bob/swap.rs index 23ab6388..40f55725 100644 --- a/swap/src/protocol/bob/swap.rs +++ b/swap/src/protocol/bob/swap.rs @@ -37,7 +37,7 @@ pub async fn run_until( &mut swap.event_loop_handle, swap.bitcoin_wallet.as_ref(), swap.monero_wallet.as_ref(), - swap.receive_monero_address, + swap.monero_receive_address, ) .await?; @@ -56,7 +56,7 @@ async fn next_state( event_loop_handle: &mut EventLoopHandle, bitcoin_wallet: &bitcoin::Wallet, monero_wallet: &monero::Wallet, - receive_monero_address: monero::Address, + monero_receive_address: monero::Address, ) -> Result { tracing::trace!(%state, "Advancing state"); @@ -224,10 +224,10 @@ async fn next_state( // Ensure that the generated wallet is synced so we have a proper balance monero_wallet.refresh().await?; // Sweep (transfer all funds) to the given address - let tx_hashes = monero_wallet.sweep_all(receive_monero_address).await?; + let tx_hashes = monero_wallet.sweep_all(monero_receive_address).await?; for tx_hash in tx_hashes { - tracing::info!(%receive_monero_address, txid=%tx_hash.0, "Sent XMR to"); + tracing::info!(%monero_receive_address, txid=%tx_hash.0, "Sent XMR to"); } BobState::XmrRedeemed {