From 37f97ac4715713d657a7944240c02ea955643c81 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Thu, 4 Mar 2021 17:07:02 +1100
Subject: [PATCH] Shorten function name

The variable will always be at least called `wallet`, hence we can
omit the `_wallet` postfix from the function name.
---
 swap/src/bin/asb.rs         |  2 +-
 swap/src/bin/swap_cli.rs    |  4 ++--
 swap/src/bitcoin/wallet.rs  |  2 +-
 swap/tests/testutils/mod.rs | 14 +++++++-------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/swap/src/bin/asb.rs b/swap/src/bin/asb.rs
index 01e72c69..df0b7676 100644
--- a/swap/src/bin/asb.rs
+++ b/swap/src/bin/asb.rs
@@ -141,7 +141,7 @@ async fn init_wallets(
     )
     .await?;
 
-    bitcoin_wallet.sync_wallet().await?;
+    bitcoin_wallet.sync().await?;
 
     let bitcoin_balance = bitcoin_wallet.balance().await?;
     info!(
diff --git a/swap/src/bin/swap_cli.rs b/swap/src/bin/swap_cli.rs
index d80a9a7d..e02f69a3 100644
--- a/swap/src/bin/swap_cli.rs
+++ b/swap/src/bin/swap_cli.rs
@@ -113,7 +113,7 @@ async fn main() -> Result<()> {
                 bitcoin_wallet.new_address(),
                 async {
                     while bitcoin_wallet.balance().await? == Amount::ZERO {
-                        bitcoin_wallet.sync_wallet().await?;
+                        bitcoin_wallet.sync().await?;
 
                         tokio::time::sleep(Duration::from_secs(1)).await;
                     }
@@ -256,7 +256,7 @@ async fn init_bitcoin_wallet(
     )
     .await?;
 
-    wallet.sync_wallet().await?;
+    wallet.sync().await?;
 
     Ok(wallet)
 }
diff --git a/swap/src/bitcoin/wallet.rs b/swap/src/bitcoin/wallet.rs
index 1f470e63..25f2e5d7 100644
--- a/swap/src/bitcoin/wallet.rs
+++ b/swap/src/bitcoin/wallet.rs
@@ -105,7 +105,7 @@ impl Wallet {
         Ok(Amount::from_sat(fees))
     }
 
-    pub async fn sync_wallet(&self) -> Result<()> {
+    pub async fn sync(&self) -> Result<()> {
         self.inner
             .lock()
             .await
diff --git a/swap/tests/testutils/mod.rs b/swap/tests/testutils/mod.rs
index 1dcaeabb..7b15d44f 100644
--- a/swap/tests/testutils/mod.rs
+++ b/swap/tests/testutils/mod.rs
@@ -151,7 +151,7 @@ impl TestContext {
 
         assert!(matches!(state, AliceState::BtcRedeemed));
 
-        self.alice_bitcoin_wallet.sync_wallet().await.unwrap();
+        self.alice_bitcoin_wallet.sync().await.unwrap();
 
         let btc_balance_after_swap = self.alice_bitcoin_wallet.as_ref().balance().await.unwrap();
         assert_eq!(
@@ -181,7 +181,7 @@ impl TestContext {
 
         assert!(matches!(state, AliceState::XmrRefunded));
 
-        self.alice_bitcoin_wallet.sync_wallet().await.unwrap();
+        self.alice_bitcoin_wallet.sync().await.unwrap();
 
         let btc_balance_after_swap = self.alice_bitcoin_wallet.as_ref().balance().await.unwrap();
         assert_eq!(btc_balance_after_swap, self.alice_starting_balances.btc);
@@ -200,7 +200,7 @@ impl TestContext {
     pub async fn assert_alice_punished(&self, state: AliceState) {
         assert!(matches!(state, AliceState::BtcPunished));
 
-        self.alice_bitcoin_wallet.sync_wallet().await.unwrap();
+        self.alice_bitcoin_wallet.sync().await.unwrap();
 
         let btc_balance_after_swap = self.alice_bitcoin_wallet.as_ref().balance().await.unwrap();
         assert_eq!(
@@ -219,7 +219,7 @@ impl TestContext {
     }
 
     pub async fn assert_bob_redeemed(&self, state: BobState) {
-        self.bob_bitcoin_wallet.sync_wallet().await.unwrap();
+        self.bob_bitcoin_wallet.sync().await.unwrap();
 
         let lock_tx_id = if let BobState::XmrRedeemed { tx_lock_id } = state {
             tx_lock_id
@@ -251,7 +251,7 @@ impl TestContext {
     }
 
     pub async fn assert_bob_refunded(&self, state: BobState) {
-        self.bob_bitcoin_wallet.sync_wallet().await.unwrap();
+        self.bob_bitcoin_wallet.sync().await.unwrap();
 
         let lock_tx_id = if let BobState::BtcRefunded(state4) = state {
             state4.tx_lock_id()
@@ -285,7 +285,7 @@ impl TestContext {
     }
 
     pub async fn assert_bob_punished(&self, state: BobState) {
-        self.bob_bitcoin_wallet.sync_wallet().await.unwrap();
+        self.bob_bitcoin_wallet.sync().await.unwrap();
 
         let lock_tx_id = if let BobState::BtcPunished { tx_lock_id } = state {
             tx_lock_id
@@ -636,7 +636,7 @@ async fn init_test_wallets(
         let max_retries = 30u8;
         loop {
             retries += 1;
-            btc_wallet.sync_wallet().await.unwrap();
+            btc_wallet.sync().await.unwrap();
 
             let btc_balance = btc_wallet.balance().await.unwrap();