Skip to content

Commit

Permalink
fix integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
SWvheerden committed Sep 10, 2024
1 parent e046568 commit cf173a3
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion integration_tests/src/merge_mining_proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ impl MergeMiningProxyProcess {
.await
.unwrap()
.into_inner()
.one_sided_address;
.interactive_address;
let wallet_payment_address = TariAddress::from_bytes(wallet_address).unwrap();
thread::spawn(move || {
let cli = Cli {
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/src/miner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ impl MinerProcess {
.await
.unwrap()
.into_inner()
.one_sided_address;
.interactive_address;
let wallet_payment_address = TariAddress::from_bytes(wallet_adress).unwrap();

let node = world.get_node(&self.base_node_name).unwrap().grpc_port;
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/src/world.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ impl TariWorld {
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
},
Err(_) => {
let ffi_wallet = self.get_ffi_wallet(name).unwrap();
Expand Down
4 changes: 2 additions & 2 deletions integration_tests/tests/steps/wallet_cli_steps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ async fn send_from_cli(world: &mut TariWorld, amount: u64, wallet_a: String, wal
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();
let wallet_b_address = TariAddress::from_base58(wallet_b_address.as_str()).unwrap();

Expand Down Expand Up @@ -208,7 +208,7 @@ async fn make_it_rain(
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();
let wallet_b_address = TariAddress::from_base58(wallet_b_address.as_str()).unwrap();

Expand Down
20 changes: 10 additions & 10 deletions integration_tests/tests/steps/wallet_steps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ async fn wallet_detects_all_txs_are_at_least_in_some_status(
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();
let tx_ids = world.wallet_tx_ids.get(&wallet_address).unwrap();

Expand Down Expand Up @@ -347,7 +347,7 @@ async fn wallet_detects_all_txs_as_broadcast(world: &mut TariWorld, wallet_name:
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();
let tx_ids = world.wallet_tx_ids.get(&wallet_address).unwrap();

Expand Down Expand Up @@ -400,7 +400,7 @@ async fn wallet_detects_last_tx_as_pending(world: &mut TariWorld, wallet: String
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();
let tx_ids = world.wallet_tx_ids.get(&wallet_address).unwrap();
let tx_id = tx_ids.last().unwrap(); // get last transaction
Expand Down Expand Up @@ -446,7 +446,7 @@ async fn wallet_detects_last_tx_as_cancelled(world: &mut TariWorld, wallet: Stri
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();
let tx_ids = world.wallet_tx_ids.get(&wallet_address).unwrap();
let tx_id = tx_ids.last().unwrap(); // get last transaction
Expand Down Expand Up @@ -1116,7 +1116,7 @@ async fn stop_wallet(world: &mut TariWorld, wallet: String) {
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();
let wallet_ps = world.wallets.get_mut(&wallet).unwrap();
world.wallet_addresses.insert(wallet.clone(), wallet_address);
Expand Down Expand Up @@ -2116,7 +2116,7 @@ async fn send_one_sided_stealth_transaction(
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();

let mut receiver_client = create_wallet_client(world, receiver.clone()).await.unwrap();
Expand All @@ -2125,7 +2125,7 @@ async fn send_one_sided_stealth_transaction(
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();

let payment_recipient = PaymentRecipient {
Expand Down Expand Up @@ -2604,7 +2604,7 @@ async fn multi_send_txs_from_wallet(
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();

let mut receiver_wallet_client = create_wallet_client(world, receiver.clone()).await.unwrap();
Expand All @@ -2613,7 +2613,7 @@ async fn multi_send_txs_from_wallet(
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();

let mut transfer_res = vec![];
Expand Down Expand Up @@ -2766,7 +2766,7 @@ async fn cancel_last_transaction_in_wallet(world: &mut TariWorld, wallet: String
.await
.unwrap()
.into_inner()
.one_sided_address
.interactive_address
.to_hex();

let wallet_tx_ids = world.wallet_tx_ids.get(&wallet_address).unwrap();
Expand Down

0 comments on commit cf173a3

Please sign in to comment.