From 4fd6a3d27f2ee48356023f2b1c8c51f96d0b6d7b Mon Sep 17 00:00:00 2001 From: Cole Lightfighter Date: Tue, 17 Oct 2017 10:56:57 -0600 Subject: [PATCH 1/2] Subaddress unit tests Basic unit test fixture, and initialization of a subaddress account. Signed-off-by: Cole Lightfighter --- tests/unit_tests/CMakeLists.txt | 1 + tests/unit_tests/subaddress.cpp | 92 +++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 tests/unit_tests/subaddress.cpp diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt index c7efcf074..e10648d20 100644 --- a/tests/unit_tests/CMakeLists.txt +++ b/tests/unit_tests/CMakeLists.txt @@ -55,6 +55,7 @@ set(unit_tests_sources serialization.cpp sha256.cpp slow_memmem.cpp + subaddress.cpp test_tx_utils.cpp test_peerlist.cpp test_protocol_pack.cpp diff --git a/tests/unit_tests/subaddress.cpp b/tests/unit_tests/subaddress.cpp new file mode 100644 index 000000000..0233b74a6 --- /dev/null +++ b/tests/unit_tests/subaddress.cpp @@ -0,0 +1,92 @@ +// Copyright (c) 2014-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 +#include +#include "gtest/gtest.h" + +#include "include_base_utils.h" +#include "wallet/wallet2.h" +#include "crypto/crypto.h" +#include "cryptonote_basic/account.h" +#include "cryptonote_basic/cryptonote_basic_impl.h" +#include "wallet/api/subaddress.h" + +class WalletSubaddress : public ::testing::Test +{ + protected: + virtual void SetUp() + { + try + { + w1.generate(wallet_name, password, recovery_key, true, false); + } + catch (const std::exception& e) + { + LOG_ERROR("failed to generate wallet: " << e.what()); + throw e; + } + + w1.add_subaddress_account(test_label); + w1.set_subaddress_label(subaddress_index, test_label); + } + + 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"; + + uint32_t major_index = 0; + uint32_t minor_index = 0; + const cryptonote::subaddress_index subaddress_index = {major_index, minor_index}; +}; + +TEST_F(WalletSubaddress, AddRow) +{ + EXPECT_EQ(test_label, w1.get_subaddress_label(subaddress_index)); +} From 4fb7794651f5664eba33d583ce765a8323091f84 Mon Sep 17 00:00:00 2001 From: Cole Lightfighter Date: Thu, 19 Oct 2017 20:33:58 -0600 Subject: [PATCH 2/2] unit tests: OOB indexes & adding subaddress Tests for checking proper error throwing for out-of-bounds subaddress indexes, and proper addition of subaddresses. Signed-off-by: Cole Lightfighter --- tests/unit_tests/subaddress.cpp | 56 ++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/tests/unit_tests/subaddress.cpp b/tests/unit_tests/subaddress.cpp index 0233b74a6..c304b7347 100644 --- a/tests/unit_tests/subaddress.cpp +++ b/tests/unit_tests/subaddress.cpp @@ -44,12 +44,12 @@ class WalletSubaddress : public ::testing::Test { try { - w1.generate(wallet_name, password, recovery_key, true, false); + w1.generate(wallet_name, password, recovery_key, true, false); } catch (const std::exception& e) { - LOG_ERROR("failed to generate wallet: " << e.what()); - throw e; + LOG_ERROR("failed to generate wallet: " << e.what()); + throw e; } w1.add_subaddress_account(test_label); @@ -58,21 +58,20 @@ 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"); + 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_file) ) + boost::filesystem::remove(wallet_file); - if ( boost::filesystem::exists(wallet_address_file) ) - boost::filesystem::remove(wallet_address_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); + 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"; @@ -86,7 +85,34 @@ class WalletSubaddress : public ::testing::Test const cryptonote::subaddress_index subaddress_index = {major_index, minor_index}; }; -TEST_F(WalletSubaddress, AddRow) +TEST_F(WalletSubaddress, GetSubaddressLabel) +{ + EXPECT_EQ(test_label, w1.get_subaddress_label(subaddress_index)); +} + +TEST_F(WalletSubaddress, AddSubaddress) +{ + std::string label = "test adding subaddress"; + w1.add_subaddress(0, label); + EXPECT_EQ(label, w1.get_subaddress_label({0, 1})); +} + +TEST_F(WalletSubaddress, OutOfBoundsIndexes) { - EXPECT_EQ(test_label, w1.get_subaddress_label(subaddress_index)); + try + { + w1.get_subaddress_label({1,0}); + } + catch(const std::exception& e) + { + EXPECT_STREQ("index_major is out of bound", e.what()); + } + try + { + w1.get_subaddress_label({0,2}); + } + catch(const std::exception& e) + { + EXPECT_STREQ("index.minor is out of bound", e.what()); + } }