remove device parameters from make_carrot_transaction_proposal_v1

jeffro256 · Feb 25, 2025 · 0f856c9 · 0f856c9
1 parent ad18a25
commit 0f856c9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 24 deletions.
diff --git a/src/carrot_impl/carrot_tx_builder_utils.cpp b/src/carrot_impl/carrot_tx_builder_utils.cpp
@@ -104,8 +104,6 @@ void make_carrot_transaction_proposal_v1(const std::vector<CarrotPaymentProposal
     const std::vector<uint8_t> &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)
 {
@@ -202,8 +200,6 @@ void make_carrot_transaction_proposal_v1_transfer_subtractable(
     const rct::xmr_amount fee_per_weight,
     const std::vector<uint8_t> &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<std::size_t> &subtractable_normal_payment_proposals,
     const std::set<std::size_t> &subtractable_selfsend_payment_proposals,
@@ -348,8 +344,6 @@ void make_carrot_transaction_proposal_v1_transfer_subtractable(
         extra,
         std::forward<select_inputs_func_t>(select_inputs),
         std::move(carve_fees_and_balance),
-        s_view_balance_dev,
-        k_view_dev,
         account_spend_pubkey,
         tx_proposal_out);
 }
@@ -360,8 +354,6 @@ void make_carrot_transaction_proposal_v1_transfer(
     const rct::xmr_amount fee_per_weight,
     const std::vector<uint8_t> &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,
     CarrotTransactionProposalV1 &tx_proposal_out)
 {
@@ -371,8 +363,6 @@ void make_carrot_transaction_proposal_v1_transfer(
         fee_per_weight,
         extra,
         std::forward<select_inputs_func_t>(select_inputs),
-        s_view_balance_dev,
-        k_view_dev,
         account_spend_pubkey,
         /*subtractable_normal_payment_proposals=*/{},
         /*subtractable_selfsend_payment_proposals=*/{selfsend_payment_proposals.size()},
@@ -384,8 +374,6 @@ void make_carrot_transaction_proposal_v1_sweep(
     const rct::xmr_amount fee_per_weight,
     const std::vector<uint8_t> &extra,
     std::vector<CarrotSelectedInput> &&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)
 {
@@ -452,8 +440,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
@@ -67,8 +67,6 @@ void make_carrot_transaction_proposal_v1(const std::vector<CarrotPaymentProposal
     const std::vector<uint8_t> &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);
 
@@ -78,8 +76,6 @@ void make_carrot_transaction_proposal_v1_transfer_subtractable(
     const rct::xmr_amount fee_per_weight,
     const std::vector<uint8_t> &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<std::size_t> &subtractable_normal_payment_proposals,
     const std::set<std::size_t> &subtractable_selfsend_payment_proposals,
@@ -91,8 +87,6 @@ void make_carrot_transaction_proposal_v1_transfer(
     const rct::xmr_amount fee_per_weight,
     const std::vector<uint8_t> &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,
     CarrotTransactionProposalV1 &tx_proposal_out);
 
@@ -101,8 +95,6 @@ void make_carrot_transaction_proposal_v1_sweep(
     const rct::xmr_amount fee_per_weight,
     const std::vector<uint8_t> &extra,
     std::vector<CarrotSelectedInput> &&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_impl.cpp b/tests/unit_tests/carrot_impl.cpp
@@ -523,8 +523,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.get_view_balance_device(),
-        &ss_keys.k_view_dev,
         ss_keys.account_spend_pubkey,
         tx_proposal);