carrot_impl: remove device parameters from tx proposal making functions
This commit is contained in:
@@ -128,8 +128,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)
|
||||
{
|
||||
@@ -244,8 +242,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,
|
||||
const std::set<std::size_t> &subtractable_normal_payment_proposals,
|
||||
const std::set<std::size_t> &subtractable_selfsend_payment_proposals,
|
||||
@@ -396,8 +392,6 @@ void make_carrot_transaction_proposal_v1_transfer(
|
||||
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);
|
||||
}
|
||||
@@ -408,8 +402,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)
|
||||
{
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -58,8 +58,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);
|
||||
|
||||
@@ -69,8 +67,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,
|
||||
const std::set<std::size_t> &subtractable_normal_payment_proposals,
|
||||
const std::set<std::size_t> &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<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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user