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

Don't call as_ref() unless necessary

Browse Source
This commit is contained in:
Thomas Eizinger 2021-03-26 11:54:28 +11:00
parent 4ab7e83806
commit a4c70dfe94
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
1 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
swap/tests/testutils/mod.rs
View File

@ -149,19 +149,14 @@ impl TestContext {
self.alice_bitcoin_wallet.sync().await.unwrap(); self.alice_bitcoin_wallet.sync().await.unwrap();
let btc_balance_after_swap = self.alice_bitcoin_wallet.as_ref().balance().await.unwrap(); let btc_balance_after_swap = self.alice_bitcoin_wallet.balance().await.unwrap();
assert_eq!( assert_eq!(
btc_balance_after_swap, btc_balance_after_swap,
self.alice_starting_balances.btc + self.btc_amount self.alice_starting_balances.btc + self.btc_amount
- bitcoin::Amount::from_sat(bitcoin::TX_FEE) - bitcoin::Amount::from_sat(bitcoin::TX_FEE)
); );
let xmr_balance_after_swap = self let xmr_balance_after_swap = self.alice_monero_wallet.get_balance().await.unwrap();
.alice_monero_wallet
.as_ref()
.get_balance()
.await
.unwrap();
assert!( assert!(
xmr_balance_after_swap <= self.alice_starting_balances.xmr - self.xmr_amount, xmr_balance_after_swap <= self.alice_starting_balances.xmr - self.xmr_amount,
"{} !< {} - {}", "{} !< {} - {}",
@ -176,17 +171,12 @@ impl TestContext {
self.alice_bitcoin_wallet.sync().await.unwrap(); self.alice_bitcoin_wallet.sync().await.unwrap();
let btc_balance_after_swap = self.alice_bitcoin_wallet.as_ref().balance().await.unwrap(); let btc_balance_after_swap = self.alice_bitcoin_wallet.balance().await.unwrap();
assert_eq!(btc_balance_after_swap, self.alice_starting_balances.btc); assert_eq!(btc_balance_after_swap, self.alice_starting_balances.btc);
// Ensure that Alice's balance is refreshed as we use a newly created wallet // Ensure that Alice's balance is refreshed as we use a newly created wallet
self.alice_monero_wallet.as_ref().refresh().await.unwrap(); self.alice_monero_wallet.refresh().await.unwrap();
let xmr_balance_after_swap = self let xmr_balance_after_swap = self.alice_monero_wallet.get_balance().await.unwrap();
.alice_monero_wallet
.as_ref()
.get_balance()
.await
.unwrap();
// Alice pays fees - comparison does not take exact lock fee into account // Alice pays fees - comparison does not take exact lock fee into account
assert!( assert!(
@ -203,19 +193,14 @@ impl TestContext {
self.alice_bitcoin_wallet.sync().await.unwrap(); self.alice_bitcoin_wallet.sync().await.unwrap();
let btc_balance_after_swap = self.alice_bitcoin_wallet.as_ref().balance().await.unwrap(); let btc_balance_after_swap = self.alice_bitcoin_wallet.balance().await.unwrap();
assert_eq!( assert_eq!(
btc_balance_after_swap, btc_balance_after_swap,
self.alice_starting_balances.btc + self.btc_amount self.alice_starting_balances.btc + self.btc_amount
- bitcoin::Amount::from_sat(2 * bitcoin::TX_FEE) - bitcoin::Amount::from_sat(2 * bitcoin::TX_FEE)
); );
let xmr_balance_after_swap = self let xmr_balance_after_swap = self.alice_monero_wallet.get_balance().await.unwrap();
.alice_monero_wallet
.as_ref()
.get_balance()
.await
.unwrap();
assert!(xmr_balance_after_swap <= self.alice_starting_balances.xmr - self.xmr_amount); assert!(xmr_balance_after_swap <= self.alice_starting_balances.xmr - self.xmr_amount);
} }
@ -234,7 +219,7 @@ impl TestContext {
.await .await
.unwrap(); .unwrap();
let btc_balance_after_swap = self.bob_bitcoin_wallet.as_ref().balance().await.unwrap(); let btc_balance_after_swap = self.bob_bitcoin_wallet.balance().await.unwrap();
assert_eq!( assert_eq!(
btc_balance_after_swap, btc_balance_after_swap,
self.bob_starting_balances.btc - self.btc_amount - lock_tx_bitcoin_fee self.bob_starting_balances.btc - self.btc_amount - lock_tx_bitcoin_fee
@ -246,8 +231,8 @@ impl TestContext {
self.bob_monero_wallet.refresh().await.unwrap(); self.bob_monero_wallet.refresh().await.unwrap();
// Ensure that Bob's balance is refreshed as we use a newly created wallet // Ensure that Bob's balance is refreshed as we use a newly created wallet
self.bob_monero_wallet.as_ref().refresh().await.unwrap(); self.bob_monero_wallet.refresh().await.unwrap();
let xmr_balance_after_swap = self.bob_monero_wallet.as_ref().get_balance().await.unwrap(); let xmr_balance_after_swap = self.bob_monero_wallet.get_balance().await.unwrap();
assert!(xmr_balance_after_swap > self.bob_starting_balances.xmr); assert!(xmr_balance_after_swap > self.bob_starting_balances.xmr);
} }
@ -265,7 +250,7 @@ impl TestContext {
.await .await
.unwrap(); .unwrap();
let btc_balance_after_swap = self.bob_bitcoin_wallet.as_ref().balance().await.unwrap(); let btc_balance_after_swap = self.bob_bitcoin_wallet.balance().await.unwrap();
let alice_submitted_cancel = btc_balance_after_swap let alice_submitted_cancel = btc_balance_after_swap
== self.bob_starting_balances.btc == self.bob_starting_balances.btc
@ -281,7 +266,7 @@ impl TestContext {
// Since we cannot be sure who submitted it we have to assert accordingly // Since we cannot be sure who submitted it we have to assert accordingly
assert!(alice_submitted_cancel || bob_submitted_cancel); assert!(alice_submitted_cancel || bob_submitted_cancel);
let xmr_balance_after_swap = self.bob_monero_wallet.as_ref().get_balance().await.unwrap(); let xmr_balance_after_swap = self.bob_monero_wallet.get_balance().await.unwrap();
assert_eq!(xmr_balance_after_swap, self.bob_starting_balances.xmr); assert_eq!(xmr_balance_after_swap, self.bob_starting_balances.xmr);
} }
@ -300,13 +285,13 @@ impl TestContext {
.await .await
.unwrap(); .unwrap();
let btc_balance_after_swap = self.bob_bitcoin_wallet.as_ref().balance().await.unwrap(); let btc_balance_after_swap = self.bob_bitcoin_wallet.balance().await.unwrap();
assert_eq!( assert_eq!(
btc_balance_after_swap, btc_balance_after_swap,
self.bob_starting_balances.btc - self.btc_amount - lock_tx_bitcoin_fee self.bob_starting_balances.btc - self.btc_amount - lock_tx_bitcoin_fee
); );
let xmr_balance_after_swap = self.bob_monero_wallet.as_ref().get_balance().await.unwrap(); let xmr_balance_after_swap = self.bob_monero_wallet.get_balance().await.unwrap();
assert_eq!(xmr_balance_after_swap, self.bob_starting_balances.xmr); assert_eq!(xmr_balance_after_swap, self.bob_starting_balances.xmr);
} }
} }