aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/performance_tests/CMakeLists.txt2
-rw-r--r--tests/performance_tests/check_tx_signature.h (renamed from tests/performance_tests/check_ring_signature.h)25
-rw-r--r--tests/performance_tests/construct_tx.h6
-rw-r--r--tests/performance_tests/main.cpp68
-rw-r--r--tests/performance_tests/multi_tx_test_base.h3
-rw-r--r--tests/performance_tests/performance_tests.h1
6 files changed, 69 insertions, 36 deletions
diff --git a/tests/performance_tests/CMakeLists.txt b/tests/performance_tests/CMakeLists.txt
index 37accb393..36dfd5952 100644
--- a/tests/performance_tests/CMakeLists.txt
+++ b/tests/performance_tests/CMakeLists.txt
@@ -30,7 +30,7 @@ set(performance_tests_sources
main.cpp)
set(performance_tests_headers
- check_ring_signature.h
+ check_tx_signature.h
cn_slow_hash.h
construct_tx.h
derive_public_key.h
diff --git a/tests/performance_tests/check_ring_signature.h b/tests/performance_tests/check_tx_signature.h
index a55849742..fe595a4da 100644
--- a/tests/performance_tests/check_ring_signature.h
+++ b/tests/performance_tests/check_tx_signature.h
@@ -36,17 +36,19 @@
#include "cryptonote_core/cryptonote_basic.h"
#include "cryptonote_core/cryptonote_format_utils.h"
#include "crypto/crypto.h"
+#include "ringct/rctSigs.h"
#include "multi_tx_test_base.h"
-template<size_t a_ring_size>
-class test_check_ring_signature : private multi_tx_test_base<a_ring_size>
+template<size_t a_ring_size, bool a_rct>
+class test_check_tx_signature : private multi_tx_test_base<a_ring_size>
{
static_assert(0 < a_ring_size, "ring_size must be greater than 0");
public:
- static const size_t loop_count = a_ring_size < 100 ? 100 : 10;
+ static const size_t loop_count = a_rct ? 10 : a_ring_size < 100 ? 100 : 10;
static const size_t ring_size = a_ring_size;
+ static const bool rct = a_rct;
typedef multi_tx_test_base<a_ring_size> base_class;
@@ -62,7 +64,8 @@ public:
std::vector<tx_destination_entry> destinations;
destinations.push_back(tx_destination_entry(this->m_source_amount, m_alice.get_keys().m_account_address));
- if (!construct_tx(this->m_miners[this->real_source_idx].get_keys(), this->m_sources, destinations, std::vector<uint8_t>(), m_tx, 0))
+ crypto::secret_key tx_key;
+ if (!construct_tx_and_get_tx_key(this->m_miners[this->real_source_idx].get_keys(), this->m_sources, destinations, std::vector<uint8_t>(), m_tx, 0, tx_key, rct))
return false;
get_transaction_prefix_hash(m_tx, m_tx_prefix_hash);
@@ -72,8 +75,18 @@ public:
bool test()
{
- const cryptonote::txin_to_key& txin = boost::get<cryptonote::txin_to_key>(m_tx.vin[0]);
- return crypto::check_ring_signature(m_tx_prefix_hash, txin.k_image, this->m_public_key_ptrs, ring_size, m_tx.signatures[0].data());
+ if (rct)
+ {
+ if (m_tx.rct_signatures.type == rct::RCTTypeFull)
+ return rct::verRct(m_tx.rct_signatures);
+ else
+ return rct::verRctSimple(m_tx.rct_signatures);
+ }
+ else
+ {
+ const cryptonote::txin_to_key& txin = boost::get<cryptonote::txin_to_key>(m_tx.vin[0]);
+ return crypto::check_ring_signature(m_tx_prefix_hash, txin.k_image, this->m_public_key_ptrs, ring_size, m_tx.signatures[0].data());
+ }
}
private:
diff --git a/tests/performance_tests/construct_tx.h b/tests/performance_tests/construct_tx.h
index d3409c0f3..aef455eaa 100644
--- a/tests/performance_tests/construct_tx.h
+++ b/tests/performance_tests/construct_tx.h
@@ -36,7 +36,7 @@
#include "multi_tx_test_base.h"
-template<size_t a_in_count, size_t a_out_count>
+template<size_t a_in_count, size_t a_out_count, bool a_rct>
class test_construct_tx : private multi_tx_test_base<a_in_count>
{
static_assert(0 < a_in_count, "in_count must be greater than 0");
@@ -46,6 +46,7 @@ public:
static const size_t loop_count = (a_in_count + a_out_count < 100) ? 100 : 10;
static const size_t in_count = a_in_count;
static const size_t out_count = a_out_count;
+ static const bool rct = a_rct;
typedef multi_tx_test_base<a_in_count> base_class;
@@ -68,7 +69,8 @@ public:
bool test()
{
- return cryptonote::construct_tx(this->m_miners[this->real_source_idx].get_keys(), this->m_sources, m_destinations, std::vector<uint8_t>(), m_tx, 0);
+ 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);
}
private:
diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp
index 84a51aa96..4de0fac54 100644
--- a/tests/performance_tests/main.cpp
+++ b/tests/performance_tests/main.cpp
@@ -33,7 +33,7 @@
// tests
#include "construct_tx.h"
-#include "check_ring_signature.h"
+#include "check_tx_signature.h"
#include "cn_slow_hash.h"
#include "derive_public_key.h"
#include "derive_secret_key.h"
@@ -50,31 +50,47 @@ int main(int argc, char** argv)
performance_timer timer;
timer.start();
- TEST_PERFORMANCE2(test_construct_tx, 1, 1);
- TEST_PERFORMANCE2(test_construct_tx, 1, 2);
- TEST_PERFORMANCE2(test_construct_tx, 1, 10);
- TEST_PERFORMANCE2(test_construct_tx, 1, 100);
- TEST_PERFORMANCE2(test_construct_tx, 1, 1000);
-
- TEST_PERFORMANCE2(test_construct_tx, 2, 1);
- TEST_PERFORMANCE2(test_construct_tx, 2, 2);
- TEST_PERFORMANCE2(test_construct_tx, 2, 10);
- TEST_PERFORMANCE2(test_construct_tx, 2, 100);
-
- TEST_PERFORMANCE2(test_construct_tx, 10, 1);
- TEST_PERFORMANCE2(test_construct_tx, 10, 2);
- TEST_PERFORMANCE2(test_construct_tx, 10, 10);
- TEST_PERFORMANCE2(test_construct_tx, 10, 100);
-
- TEST_PERFORMANCE2(test_construct_tx, 100, 1);
- TEST_PERFORMANCE2(test_construct_tx, 100, 2);
- TEST_PERFORMANCE2(test_construct_tx, 100, 10);
- TEST_PERFORMANCE2(test_construct_tx, 100, 100);
-
- TEST_PERFORMANCE1(test_check_ring_signature, 1);
- TEST_PERFORMANCE1(test_check_ring_signature, 2);
- TEST_PERFORMANCE1(test_check_ring_signature, 10);
- TEST_PERFORMANCE1(test_check_ring_signature, 100);
+ TEST_PERFORMANCE3(test_construct_tx, 1, 1, false);
+ TEST_PERFORMANCE3(test_construct_tx, 1, 2, false);
+ TEST_PERFORMANCE3(test_construct_tx, 1, 10, false);
+ TEST_PERFORMANCE3(test_construct_tx, 1, 100, false);
+ TEST_PERFORMANCE3(test_construct_tx, 1, 1000, false);
+
+ TEST_PERFORMANCE3(test_construct_tx, 2, 1, false);
+ TEST_PERFORMANCE3(test_construct_tx, 2, 2, false);
+ TEST_PERFORMANCE3(test_construct_tx, 2, 10, false);
+ TEST_PERFORMANCE3(test_construct_tx, 2, 100, false);
+
+ TEST_PERFORMANCE3(test_construct_tx, 10, 1, false);
+ TEST_PERFORMANCE3(test_construct_tx, 10, 2, false);
+ TEST_PERFORMANCE3(test_construct_tx, 10, 10, false);
+ TEST_PERFORMANCE3(test_construct_tx, 10, 100, false);
+
+ TEST_PERFORMANCE3(test_construct_tx, 100, 1, false);
+ TEST_PERFORMANCE3(test_construct_tx, 100, 2, false);
+ TEST_PERFORMANCE3(test_construct_tx, 100, 10, false);
+ TEST_PERFORMANCE3(test_construct_tx, 100, 100, false);
+
+ TEST_PERFORMANCE3(test_construct_tx, 2, 1, true);
+ TEST_PERFORMANCE3(test_construct_tx, 2, 2, true);
+ TEST_PERFORMANCE3(test_construct_tx, 2, 10, true);
+
+ TEST_PERFORMANCE3(test_construct_tx, 10, 1, true);
+ TEST_PERFORMANCE3(test_construct_tx, 10, 2, true);
+ TEST_PERFORMANCE3(test_construct_tx, 10, 10, true);
+
+ TEST_PERFORMANCE3(test_construct_tx, 100, 1, true);
+ TEST_PERFORMANCE3(test_construct_tx, 100, 2, true);
+ TEST_PERFORMANCE3(test_construct_tx, 100, 10, true);
+
+ TEST_PERFORMANCE2(test_check_tx_signature, 1, false);
+ TEST_PERFORMANCE2(test_check_tx_signature, 2, false);
+ TEST_PERFORMANCE2(test_check_tx_signature, 10, false);
+ TEST_PERFORMANCE2(test_check_tx_signature, 100, false);
+
+ TEST_PERFORMANCE2(test_check_tx_signature, 2, true);
+ TEST_PERFORMANCE2(test_check_tx_signature, 10, true);
+ TEST_PERFORMANCE2(test_check_tx_signature, 100, true);
TEST_PERFORMANCE0(test_is_out_to_acc);
TEST_PERFORMANCE0(test_generate_key_image_helper);
diff --git a/tests/performance_tests/multi_tx_test_base.h b/tests/performance_tests/multi_tx_test_base.h
index d8898b60d..feabab022 100644
--- a/tests/performance_tests/multi_tx_test_base.h
+++ b/tests/performance_tests/multi_tx_test_base.h
@@ -59,7 +59,7 @@ public:
return false;
txout_to_key tx_out = boost::get<txout_to_key>(m_miner_txs[i].vout[0].target);
- output_entries.push_back(std::make_pair(i, rct::ctkey({rct::pk2rct(tx_out.key), rct::identity()})));
+ output_entries.push_back(std::make_pair(i, rct::ctkey({rct::pk2rct(tx_out.key), rct::zeroCommit(m_miner_txs[i].vout[0].amount)})));
m_public_keys[i] = tx_out.key;
m_public_key_ptrs[i] = &m_public_keys[i];
}
@@ -72,6 +72,7 @@ public:
source_entry.real_output_in_tx_index = 0;
source_entry.outputs.swap(output_entries);
source_entry.real_output = real_source_idx;
+ source_entry.mask = rct::identity();
source_entry.rct = false;
m_sources.push_back(source_entry);
diff --git a/tests/performance_tests/performance_tests.h b/tests/performance_tests/performance_tests.h
index 9781349bf..77707148b 100644
--- a/tests/performance_tests/performance_tests.h
+++ b/tests/performance_tests/performance_tests.h
@@ -142,3 +142,4 @@ void run_test(const char* test_name)
#define TEST_PERFORMANCE0(test_class) run_test< test_class >(QUOTEME(test_class))
#define TEST_PERFORMANCE1(test_class, a0) run_test< test_class<a0> >(QUOTEME(test_class<a0>))
#define TEST_PERFORMANCE2(test_class, a0, a1) run_test< test_class<a0, a1> >(QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ">")
+#define TEST_PERFORMANCE3(test_class, a0, a1, a2) run_test< test_class<a0, a1, a2> >(QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ">")
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 17:26:23 +0000