diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fuzz/cold-outputs.cpp | 10 | ||||
| -rw-r--r-- | tests/fuzz/cold-transaction.cpp | 10 | ||||
| -rw-r--r-- | tests/fuzz/signature.cpp | 10 | ||||
| -rw-r--r-- | tests/hash/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/performance_tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/performance_tests/main.cpp | 3 | ||||
| -rw-r--r-- | tests/performance_tests/subaddress_expand.h | 65 | ||||
| -rw-r--r-- | tests/unit_tests/crypto.cpp | 24 | ||||
| -rw-r--r-- | tests/unit_tests/memwipe.cpp | 2 | ||||
| -rw-r--r-- | tests/unit_tests/subaddress.cpp | 17 |
10 files changed, 76 insertions, 68 deletions
diff --git a/tests/fuzz/cold-outputs.cpp b/tests/fuzz/cold-outputs.cpp index 2785db05d..6e813d823 100644 --- a/tests/fuzz/cold-outputs.cpp +++ b/tests/fuzz/cold-outputs.cpp @@ -53,16 +53,8 @@ int ColdOutputsFuzzer::init() try { - boost::filesystem::remove("/tmp/cold-outputs-test.keys"); - boost::filesystem::remove("/tmp/cold-outputs-test.address.txt"); - boost::filesystem::remove("/tmp/cold-outputs-test"); - wallet.init(""); - wallet.generate("/tmp/cold-outputs-test", "", spendkey, true, false); - - boost::filesystem::remove("/tmp/cold-outputs-test.keys"); - boost::filesystem::remove("/tmp/cold-outputs-test.address.txt"); - boost::filesystem::remove("/tmp/cold-outputs-test"); + wallet.generate("", "", spendkey, true, false); } catch (const std::exception &e) { diff --git a/tests/fuzz/cold-transaction.cpp b/tests/fuzz/cold-transaction.cpp index f0b4b26d6..20715c9ed 100644 --- a/tests/fuzz/cold-transaction.cpp +++ b/tests/fuzz/cold-transaction.cpp @@ -54,16 +54,8 @@ int ColdTransactionFuzzer::init() try { - boost::filesystem::remove("/tmp/cold-transaction-test.keys"); - boost::filesystem::remove("/tmp/cold-transaction-test.address.txt"); - boost::filesystem::remove("/tmp/cold-transaction-test"); - wallet.init(""); - wallet.generate("/tmp/cold-transaction-test", "", spendkey, true, false); - - boost::filesystem::remove("/tmp/cold-transaction-test.keys"); - boost::filesystem::remove("/tmp/cold-transaction-test.address.txt"); - boost::filesystem::remove("/tmp/cold-transaction-test"); + wallet.generate("", "", spendkey, true, false); } catch (const std::exception &e) { diff --git a/tests/fuzz/signature.cpp b/tests/fuzz/signature.cpp index 7ec4434e6..e7a0a53df 100644 --- a/tests/fuzz/signature.cpp +++ b/tests/fuzz/signature.cpp @@ -54,16 +54,8 @@ int SignatureFuzzer::init() try { - boost::filesystem::remove("/tmp/signature-test.keys"); - boost::filesystem::remove("/tmp/signature-test.address.txt"); - boost::filesystem::remove("/tmp/signature-test"); - wallet.init(""); - wallet.generate("/tmp/signature-test", "", spendkey, true, false); - - boost::filesystem::remove("/tmp/signature-test.keys"); - boost::filesystem::remove("/tmp/signature-test.address.txt"); - boost::filesystem::remove("/tmp/signature-test"); + wallet.generate("", "", spendkey, true, false); cryptonote::address_parse_info info; if (!cryptonote::get_account_address_from_str_or_url(info, true, "9uVsvEryzpN8WH2t1WWhFFCG5tS8cBNdmJYNRuckLENFimfauV5pZKeS1P2CbxGkSDTUPHXWwiYE5ZGSXDAGbaZgDxobqDN")) diff --git a/tests/hash/CMakeLists.txt b/tests/hash/CMakeLists.txt index 5cc95efbb..950df10b1 100644 --- a/tests/hash/CMakeLists.txt +++ b/tests/hash/CMakeLists.txt @@ -36,6 +36,7 @@ add_executable(hash-tests ${hash_headers}) target_link_libraries(hash-tests PRIVATE + common cncrypto ${EXTRA_LIBRARIES}) set_property(TARGET hash-tests diff --git a/tests/performance_tests/CMakeLists.txt b/tests/performance_tests/CMakeLists.txt index 2b3a0d6f8..1a0677925 100644 --- a/tests/performance_tests/CMakeLists.txt +++ b/tests/performance_tests/CMakeLists.txt @@ -41,6 +41,7 @@ set(performance_tests_headers generate_key_image_helper.h generate_keypair.h is_out_to_acc.h + subaddress_expand.h multi_tx_test_base.h performance_tests.h performance_utils.h @@ -51,6 +52,7 @@ add_executable(performance_tests ${performance_tests_headers}) target_link_libraries(performance_tests PRIVATE + wallet cryptonote_core common cncrypto diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp index 459eecba4..2f3ce289d 100644 --- a/tests/performance_tests/main.cpp +++ b/tests/performance_tests/main.cpp @@ -44,6 +44,7 @@ #include "generate_key_image_helper.h" #include "generate_keypair.h" #include "is_out_to_acc.h" +#include "subaddress_expand.h" #include "sc_reduce32.h" #include "cn_fast_hash.h" @@ -112,6 +113,8 @@ int main(int argc, char** argv) TEST_PERFORMANCE0(test_generate_keypair); TEST_PERFORMANCE0(test_sc_reduce32); + TEST_PERFORMANCE2(test_wallet2_expand_subaddresses, 50, 200); + TEST_PERFORMANCE0(test_cn_slow_hash); TEST_PERFORMANCE1(test_cn_fast_hash, 32); TEST_PERFORMANCE1(test_cn_fast_hash, 16384); diff --git a/tests/performance_tests/subaddress_expand.h b/tests/performance_tests/subaddress_expand.h new file mode 100644 index 000000000..fea92d54b --- /dev/null +++ b/tests/performance_tests/subaddress_expand.h @@ -0,0 +1,65 @@ +// Copyright (c) 2017, The Monero Project +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this list of +// conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other +// materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its contributors may be +// used to endorse or promote products derived from this software without specific +// prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers + +#pragma once + +#include "wallet/wallet2.h" +#include "ringct/rctOps.h" + +#include "single_tx_test_base.h" + +template<size_t Major, size_t Minor> +class test_wallet2_expand_subaddresses : public single_tx_test_base +{ +public: + static const size_t loop_count = 1; + static const size_t major = Major; + static const size_t minor = Minor; + + bool init() + { + if (!single_tx_test_base::init()) + return false; + wallet.set_subaddress_lookahead(1, 1); + crypto::secret_key spendkey = rct::rct2sk(rct::skGen()); + wallet.generate("", "", spendkey, true, false); + wallet.set_subaddress_lookahead(major, minor); + return true; + } + + bool test() + { + wallet.expand_subaddresses({0, 0}); + return true; + } + +private: + tools::wallet2 wallet; +}; diff --git a/tests/unit_tests/crypto.cpp b/tests/unit_tests/crypto.cpp index d9a7b8ad5..3a8e787ec 100644 --- a/tests/unit_tests/crypto.cpp +++ b/tests/unit_tests/crypto.cpp @@ -47,14 +47,6 @@ namespace "8b655970153799af2aeadc9ff1add0ea6c7251d54154cfa92c173a0dd39c1f94" "6c7251d54154cfa92c173a0dd39c1f948b655970153799af2aeadc9ff1add0ea"; - static std::uint8_t md[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00 - }; - template<typename T> bool is_formatted() { @@ -69,22 +61,6 @@ namespace out << "BEGIN" << value << "END"; return out.str() == "BEGIN<" + std::string{expected, sizeof(T) * 2} + ">END"; } - - bool keccak_harness() - { - size_t inlen = sizeof(source); - int mdlen = (int)sizeof(md); - keccak(source, inlen, md, mdlen); - - if (md[0] != 0x00) - { - return true; - } - else - { - return false; - } - } } TEST(Crypto, Ostream) diff --git a/tests/unit_tests/memwipe.cpp b/tests/unit_tests/memwipe.cpp index b2b19fbf5..2d8980ef7 100644 --- a/tests/unit_tests/memwipe.cpp +++ b/tests/unit_tests/memwipe.cpp @@ -47,7 +47,7 @@ static void test(bool wipe) if ((intptr_t)quux == foop) { MDEBUG(std::hex << std::setw(8) << std::setfill('0') << *(uint32_t*)quux); - if (wipe) ASSERT_TRUE(!memcmp(quux, "\0\0\0", 3)); + if (wipe) ASSERT_TRUE(memcmp(quux, "bar", 3)); } else MWARNING("We did not get the same location, cannot check"); free(quux); diff --git a/tests/unit_tests/subaddress.cpp b/tests/unit_tests/subaddress.cpp index c304b7347..ca950b25d 100644 --- a/tests/unit_tests/subaddress.cpp +++ b/tests/unit_tests/subaddress.cpp @@ -44,7 +44,7 @@ class WalletSubaddress : public ::testing::Test { try { - w1.generate(wallet_name, password, recovery_key, true, false); + w1.generate("", password, recovery_key, true, false); } catch (const std::exception& e) { @@ -58,24 +58,9 @@ class WalletSubaddress : public ::testing::Test virtual void TearDown() { - boost::filesystem::wpath wallet_file(wallet_name); - boost::filesystem::wpath wallet_address_file(wallet_name + ".address.txt"); - boost::filesystem::wpath wallet_keys_file(wallet_name + ".keys"); - - if ( boost::filesystem::exists(wallet_file) ) - boost::filesystem::remove(wallet_file); - - if ( boost::filesystem::exists(wallet_address_file) ) - boost::filesystem::remove(wallet_address_file); - - if ( boost::filesystem::exists(wallet_keys_file) ) - boost::filesystem::remove(wallet_keys_file); } tools::wallet2 w1; - std::string path_working_dir = "."; - std::string path_test_wallet = "test_wallet"; - const std::string wallet_name = path_working_dir + "/" + path_test_wallet; const std::string password = "testpass"; crypto::secret_key recovery_key = crypto::secret_key(); const std::string test_label = "subaddress test label"; |