diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-10-15 17:21:12 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-10-15 17:21:12 +0200 |
commit | f7b9f44c1b0d53170fd7f53d37fc67648f3247a2 (patch) | |
tree | afc13a3ee6a049ec78ac234e2d55ff46e992b457 /tests/performance_tests/construct_tx.h | |
parent | Merge pull request #2548 (diff) | |
parent | Subaddresses (diff) | |
download | monero-f7b9f44c1b0d53170fd7f53d37fc67648f3247a2.tar.xz |
Merge pull request #2056
53ad5a0f Subaddresses (kenshi84)
Diffstat (limited to 'tests/performance_tests/construct_tx.h')
-rw-r--r-- | tests/performance_tests/construct_tx.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/performance_tests/construct_tx.h b/tests/performance_tests/construct_tx.h index 90e4cf76e..e01ee5cfa 100644 --- a/tests/performance_tests/construct_tx.h +++ b/tests/performance_tests/construct_tx.h @@ -61,7 +61,7 @@ public: for (size_t i = 0; i < out_count; ++i) { - m_destinations.push_back(tx_destination_entry(this->m_source_amount / out_count, m_alice.get_keys().m_account_address)); + m_destinations.push_back(tx_destination_entry(this->m_source_amount / out_count, m_alice.get_keys().m_account_address, false)); } return true; @@ -70,7 +70,10 @@ public: bool test() { crypto::secret_key tx_key; - return cryptonote::construct_tx_and_get_tx_key(this->m_miners[this->real_source_idx].get_keys(), this->m_sources, m_destinations, std::vector<uint8_t>(), m_tx, 0, tx_key, rct); + std::vector<crypto::secret_key> additional_tx_keys; + std::unordered_map<crypto::public_key, cryptonote::subaddress_index> subaddresses; + subaddresses[this->m_miners[this->real_source_idx].get_keys().m_account_address.m_spend_public_key] = {0,0}; + return cryptonote::construct_tx_and_get_tx_key(this->m_miners[this->real_source_idx].get_keys(), subaddresses, this->m_sources, m_destinations, cryptonote::account_public_address{}, std::vector<uint8_t>(), m_tx, 0, tx_key, additional_tx_keys, rct); } private: |