From cf173a346ecafc8434960829f41fee4cc47431a2 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Tue, 10 Sep 2024 09:44:40 +0200 Subject: [PATCH] fix integration tests --- integration_tests/src/merge_mining_proxy.rs | 2 +- integration_tests/src/miner.rs | 2 +- integration_tests/src/world.rs | 2 +- .../tests/steps/wallet_cli_steps.rs | 4 ++-- integration_tests/tests/steps/wallet_steps.rs | 20 +++++++++---------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/integration_tests/src/merge_mining_proxy.rs b/integration_tests/src/merge_mining_proxy.rs index ac4198b6a0..44d79535cd 100644 --- a/integration_tests/src/merge_mining_proxy.rs +++ b/integration_tests/src/merge_mining_proxy.rs @@ -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 { diff --git a/integration_tests/src/miner.rs b/integration_tests/src/miner.rs index c600b24586..868fb59e19 100644 --- a/integration_tests/src/miner.rs +++ b/integration_tests/src/miner.rs @@ -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; diff --git a/integration_tests/src/world.rs b/integration_tests/src/world.rs index 09729c3f44..5d40e029e3 100644 --- a/integration_tests/src/world.rs +++ b/integration_tests/src/world.rs @@ -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(); diff --git a/integration_tests/tests/steps/wallet_cli_steps.rs b/integration_tests/tests/steps/wallet_cli_steps.rs index 955369ee9b..6620ffb9e2 100644 --- a/integration_tests/tests/steps/wallet_cli_steps.rs +++ b/integration_tests/tests/steps/wallet_cli_steps.rs @@ -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(); @@ -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(); diff --git a/integration_tests/tests/steps/wallet_steps.rs b/integration_tests/tests/steps/wallet_steps.rs index 928f9cb88c..a9c9bae59a 100644 --- a/integration_tests/tests/steps/wallet_steps.rs +++ b/integration_tests/tests/steps/wallet_steps.rs @@ -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(); @@ -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(); @@ -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 @@ -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 @@ -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); @@ -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(); @@ -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 { @@ -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(); @@ -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![]; @@ -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();