diff --git a/tests/abort1.rs b/tests/abort1.rs index 9010a025..d05a6abc 100644 --- a/tests/abort1.rs +++ b/tests/abort1.rs @@ -93,7 +93,9 @@ fn test_stop_taker_after_setup() { let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); diff --git a/tests/abort2_case1.rs b/tests/abort2_case1.rs index 9a207e74..d69d2e42 100644 --- a/tests/abort2_case1.rs +++ b/tests/abort2_case1.rs @@ -90,7 +90,9 @@ fn test_abort_case_2_move_on_with_other_makers() { let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); @@ -198,7 +200,7 @@ fn test_abort_case_2_move_on_with_other_makers() { let taker_wallet_mut = taker.get_wallet_mut(); let swap_coins = taker_wallet_mut - .list_swap_coin_utxo_spend_info(None) + .list_incoming_swap_coin_utxo_spend_info(None) .unwrap(); let tx = taker_wallet_mut @@ -221,7 +223,7 @@ fn test_abort_case_2_move_on_with_other_makers() { taker_wallet_mut.sync().unwrap(); - let swap_coin_bal = taker_wallet_mut.balance_swap_coins(None).unwrap(); + let swap_coin_bal = taker_wallet_mut.balance_incoming_swap_coins(None).unwrap(); let descriptor_bal = taker_wallet_mut.balance_descriptor_utxo(None).unwrap(); assert_eq!(swap_coin_bal, Amount::ZERO); diff --git a/tests/abort2_case2.rs b/tests/abort2_case2.rs index 29a71323..62609e4f 100644 --- a/tests/abort2_case2.rs +++ b/tests/abort2_case2.rs @@ -96,7 +96,9 @@ fn test_abort_case_2_recover_if_no_makers_found() { let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); diff --git a/tests/abort2_case3.rs b/tests/abort2_case3.rs index 05d85f36..c42872f7 100644 --- a/tests/abort2_case3.rs +++ b/tests/abort2_case3.rs @@ -93,7 +93,9 @@ fn maker_drops_after_sending_senders_sigs() { let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); diff --git a/tests/abort3_case1.rs b/tests/abort3_case1.rs index fc9558f9..00dcf2d9 100644 --- a/tests/abort3_case1.rs +++ b/tests/abort3_case1.rs @@ -97,7 +97,9 @@ fn abort3_case1_close_at_contract_sigs_for_recvr_and_sender() { let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); diff --git a/tests/abort3_case2.rs b/tests/abort3_case2.rs index a99f60f2..ea8883d2 100644 --- a/tests/abort3_case2.rs +++ b/tests/abort3_case2.rs @@ -91,7 +91,9 @@ fn abort3_case2_close_at_contract_sigs_for_recvr() { let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); diff --git a/tests/abort3_case3.rs b/tests/abort3_case3.rs index e4e39482..83b4bf25 100644 --- a/tests/abort3_case3.rs +++ b/tests/abort3_case3.rs @@ -89,7 +89,9 @@ fn abort3_case3_close_at_hash_preimage_handover() { let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); diff --git a/tests/malice1.rs b/tests/malice1.rs index ab34eda1..4bb7ae8a 100644 --- a/tests/malice1.rs +++ b/tests/malice1.rs @@ -86,7 +86,9 @@ fn malice1_taker_broadcast_contract_prematurely() { let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); diff --git a/tests/malice2.rs b/tests/malice2.rs index 2b361247..8af68ce0 100644 --- a/tests/malice2.rs +++ b/tests/malice2.rs @@ -85,7 +85,9 @@ fn malice2_maker_broadcast_contract_prematurely() { let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); diff --git a/tests/standard_swap.rs b/tests/standard_swap.rs index 51e5070c..5a5c8bac 100644 --- a/tests/standard_swap.rs +++ b/tests/standard_swap.rs @@ -81,7 +81,9 @@ fn test_standard_coinswap() { let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); @@ -158,7 +160,7 @@ fn test_standard_coinswap() { let taker_wallet_mut = taker.get_wallet_mut(); let swap_coins = taker_wallet_mut - .list_swap_coin_utxo_spend_info(None) + .list_incoming_swap_coin_utxo_spend_info(None) .unwrap(); let tx = taker_wallet_mut @@ -179,7 +181,7 @@ fn test_standard_coinswap() { bitcoind.client.send_raw_transaction(&tx).unwrap(); generate_blocks(bitcoind, 1); - let swap_coin_bal = taker_wallet_mut.balance_swap_coins(None).unwrap(); + let swap_coin_bal = taker_wallet_mut.balance_incoming_swap_coins(None).unwrap(); let descriptor_bal = taker_wallet_mut.balance_descriptor_utxo(None).unwrap(); assert_eq!(swap_coin_bal, Amount::ZERO); diff --git a/tests/test_framework/mod.rs b/tests/test_framework/mod.rs index 161f21bf..a32bab47 100644 --- a/tests/test_framework/mod.rs +++ b/tests/test_framework/mod.rs @@ -206,7 +206,9 @@ pub fn fund_and_verify_taker( let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); @@ -255,7 +257,9 @@ pub fn fund_and_verify_maker( let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); @@ -281,7 +285,9 @@ pub fn verify_swap_results( let all_utxos = wallet.get_all_utxo().unwrap(); let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); let seed_balance = wallet.balance_descriptor_utxo(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); let spendable_balance = seed_balance + swapcoin_balance; @@ -324,7 +330,9 @@ pub fn verify_swap_results( let all_utxos = wallet.get_all_utxo().unwrap(); let fidelity_balance = wallet.balance_fidelity_bonds(Some(&all_utxos)).unwrap(); let seed_balance = wallet.balance_descriptor_utxo(Some(&all_utxos)).unwrap(); - let swapcoin_balance = wallet.balance_swap_coins(Some(&all_utxos)).unwrap(); + let swapcoin_balance = wallet + .balance_incoming_swap_coins(Some(&all_utxos)) + .unwrap(); let live_contract_balance = wallet.balance_live_contract(Some(&all_utxos)).unwrap(); let spendable_balance = seed_balance + swapcoin_balance;