From c4dbc4ea7b13ad510c766a6b43efa4bd754d14ac Mon Sep 17 00:00:00 2001 From: jeffro256 Date: Wed, 30 Apr 2025 14:37:00 -0500 Subject: [PATCH] carrot_impl: remove device parameters from tx proposal making functions --- src/carrot_impl/carrot_tx_builder_utils.cpp | 10 ---------- src/carrot_impl/carrot_tx_builder_utils.h | 6 ------ tests/unit_tests/carrot_fcmp.cpp | 2 -- tests/unit_tests/carrot_impl.cpp | 2 -- tests/unit_tests/tx_construction_helpers.cpp | 2 -- 5 files changed, 22 deletions(-) diff --git a/src/carrot_impl/carrot_tx_builder_utils.cpp b/src/carrot_impl/carrot_tx_builder_utils.cpp index c951d1d5d..2797bfd04 100644 --- a/src/carrot_impl/carrot_tx_builder_utils.cpp +++ b/src/carrot_impl/carrot_tx_builder_utils.cpp @@ -128,8 +128,6 @@ void make_carrot_transaction_proposal_v1(const std::vector &extra, select_inputs_func_t &&select_inputs, carve_fees_and_balance_func_t &&carve_fees_and_balance, - const view_balance_secret_device *s_view_balance_dev, - const view_incoming_key_device *k_view_dev, const crypto::public_key &account_spend_pubkey, CarrotTransactionProposalV1 &tx_proposal_out) { @@ -244,8 +242,6 @@ void make_carrot_transaction_proposal_v1_transfer( const rct::xmr_amount fee_per_weight, const std::vector &extra, select_inputs_func_t &&select_inputs, - const view_balance_secret_device *s_view_balance_dev, - const view_incoming_key_device *k_view_dev, const crypto::public_key &account_spend_pubkey, const std::set &subtractable_normal_payment_proposals, const std::set &subtractable_selfsend_payment_proposals, @@ -396,8 +392,6 @@ void make_carrot_transaction_proposal_v1_transfer( extra, std::forward(select_inputs), std::move(carve_fees_and_balance), - s_view_balance_dev, - k_view_dev, account_spend_pubkey, tx_proposal_out); } @@ -408,8 +402,6 @@ void make_carrot_transaction_proposal_v1_sweep( const rct::xmr_amount fee_per_weight, const std::vector &extra, std::vector &&selected_inputs, - const view_balance_secret_device *s_view_balance_dev, - const view_incoming_key_device *k_view_dev, const crypto::public_key &account_spend_pubkey, CarrotTransactionProposalV1 &tx_proposal_out) { @@ -479,8 +471,6 @@ void make_carrot_transaction_proposal_v1_sweep( extra, std::move(select_inputs), std::move(carve_fees_and_balance), - s_view_balance_dev, - k_view_dev, account_spend_pubkey, tx_proposal_out); } diff --git a/src/carrot_impl/carrot_tx_builder_utils.h b/src/carrot_impl/carrot_tx_builder_utils.h index 159f69a5e..cf43272d9 100644 --- a/src/carrot_impl/carrot_tx_builder_utils.h +++ b/src/carrot_impl/carrot_tx_builder_utils.h @@ -58,8 +58,6 @@ void make_carrot_transaction_proposal_v1(const std::vector &extra, select_inputs_func_t &&select_inputs, carve_fees_and_balance_func_t &&carve_fees_and_balance, - const view_balance_secret_device *s_view_balance_dev, - const view_incoming_key_device *k_view_dev, const crypto::public_key &account_spend_pubkey, CarrotTransactionProposalV1 &tx_proposal_out); @@ -69,8 +67,6 @@ void make_carrot_transaction_proposal_v1_transfer( const rct::xmr_amount fee_per_weight, const std::vector &extra, select_inputs_func_t &&select_inputs, - const view_balance_secret_device *s_view_balance_dev, - const view_incoming_key_device *k_view_dev, const crypto::public_key &account_spend_pubkey, const std::set &subtractable_normal_payment_proposals, const std::set &subtractable_selfsend_payment_proposals, @@ -82,8 +78,6 @@ void make_carrot_transaction_proposal_v1_sweep( const rct::xmr_amount fee_per_weight, const std::vector &extra, std::vector &&selected_inputs, - const view_balance_secret_device *s_view_balance_dev, - const view_incoming_key_device *k_view_dev, const crypto::public_key &account_spend_pubkey, CarrotTransactionProposalV1 &tx_proposal_out); diff --git a/tests/unit_tests/carrot_fcmp.cpp b/tests/unit_tests/carrot_fcmp.cpp index d7f0570cc..03babd525 100644 --- a/tests/unit_tests/carrot_fcmp.cpp +++ b/tests/unit_tests/carrot_fcmp.cpp @@ -357,8 +357,6 @@ TEST(carrot_fcmp, receive_scan_spend_and_verify_serialized_carrot_tx) }); } }, - &alice.s_view_balance_dev, - &alice.k_view_incoming_dev, alice.carrot_account_spend_pubkey, {}, {}, diff --git a/tests/unit_tests/carrot_impl.cpp b/tests/unit_tests/carrot_impl.cpp index 5c8816498..4e3013f8a 100644 --- a/tests/unit_tests/carrot_impl.cpp +++ b/tests/unit_tests/carrot_impl.cpp @@ -158,8 +158,6 @@ static void subtest_multi_account_transfer_over_transaction(const unittest_trans tx_preproposal.fee_per_weight, tx_preproposal.extra_extra, make_fake_input_selection_callback(), - &ss_keys.s_view_balance_dev, - &ss_keys.k_view_incoming_dev, ss_keys.carrot_account_spend_pubkey, {}, {}, diff --git a/tests/unit_tests/tx_construction_helpers.cpp b/tests/unit_tests/tx_construction_helpers.cpp index d76f0281d..60469b1dc 100644 --- a/tests/unit_tests/tx_construction_helpers.cpp +++ b/tests/unit_tests/tx_construction_helpers.cpp @@ -426,8 +426,6 @@ cryptonote::transaction construct_carrot_pruned_transaction_fake_inputs( fake_fee_per_weight, /*extra=*/{}, std::move(select_inputs), - /*s_view_balance_dev=*/nullptr, - &k_view_dev, acc_keys.m_account_address.m_spend_public_key, {}, {},