Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add one-sided addresses to grpc #6542

Merged
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix integration tests
SWvheerden committed Sep 10, 2024

Verified

This commit was signed with the committer’s verified signature.
musmanikram usman ikram
commit cf173a346ecafc8434960829f41fee4cc47431a2
2 changes: 1 addition & 1 deletion integration_tests/src/merge_mining_proxy.rs
Original file line number Diff line number Diff line change
@@ -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 {
2 changes: 1 addition & 1 deletion integration_tests/src/miner.rs
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion integration_tests/src/world.rs
Original file line number Diff line number Diff line change
@@ -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();
4 changes: 2 additions & 2 deletions integration_tests/tests/steps/wallet_cli_steps.rs
Original file line number Diff line number Diff line change
@@ -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();

20 changes: 10 additions & 10 deletions integration_tests/tests/steps/wallet_steps.rs
Original file line number Diff line number Diff line change
@@ -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();