6 files changed, 134 insertions, 4 deletions
diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt
index 63abe928d..53d93fcce 100644
--- a/tests/unit_tests/CMakeLists.txt
+++ b/tests/unit_tests/CMakeLists.txt
@@ -46,6 +46,7 @@ set(unit_tests_sources
   epee_utils.cpp
   fee.cpp
   get_xtype_from_string.cpp
+  hashchain.cpp
   http.cpp
   main.cpp
   mnemonics.cpp
diff --git a/tests/unit_tests/ban.cpp b/tests/unit_tests/ban.cpp
index 7d4daafb3..b8d57452e 100644
--- a/tests/unit_tests/ban.cpp
+++ b/tests/unit_tests/ban.cpp
@@ -51,7 +51,7 @@ public:
   bool get_short_chain_history(std::list<crypto::hash>& ids) const { return true; }
   bool get_stat_info(cryptonote::core_stat_info& st_inf) const {return true;}
   bool have_block(const crypto::hash& id) const {return true;}
-  void get_blockchain_top(uint64_t& height, crypto::hash& top_id)const{height=0;top_id=cryptonote::null_hash;}
+  void get_blockchain_top(uint64_t& height, crypto::hash& top_id)const{height=0;top_id=crypto::null_hash;}
   bool handle_incoming_tx(const cryptonote::blobdata& tx_blob, cryptonote::tx_verification_context& tvc, bool keeped_by_block, bool relayed, bool do_not_relay) { return true; }
   bool handle_incoming_txs(const std::list<cryptonote::blobdata>& tx_blob, std::vector<cryptonote::tx_verification_context>& tvc, bool keeped_by_block, bool relayed, bool do_not_relay) { return true; }
   bool handle_incoming_block(const cryptonote::blobdata& block_blob, cryptonote::block_verification_context& bvc, bool update_miner_blocktemplate = true) { return true; }
diff --git a/tests/unit_tests/checkpoints.cpp b/tests/unit_tests/checkpoints.cpp
index d3c4d3b2b..f6015db2f 100644
--- a/tests/unit_tests/checkpoints.cpp
+++ b/tests/unit_tests/checkpoints.cpp
@@ -30,7 +30,7 @@
 
 #include "gtest/gtest.h"
 
-#include "cryptonote_basic/checkpoints.cpp"
+#include "checkpoints/checkpoints.cpp"
 
 using namespace cryptonote;
 
diff --git a/tests/unit_tests/hashchain.cpp b/tests/unit_tests/hashchain.cpp
new file mode 100644
index 000000000..0fa0f784a
--- /dev/null
+++ b/tests/unit_tests/hashchain.cpp
@@ -0,0 +1,129 @@
+// 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.
+
+// FIXME: move this into a full wallet2 unit test suite, if possible
+
+#include "gtest/gtest.h"
+
+#include "wallet/wallet2.h"
+
+static crypto::hash make_hash(uint64_t n)
+{
+  union
+  {
+    crypto::hash hash;
+    uint64_t n;
+  } hash;
+  hash.hash = crypto::null_hash;
+  hash.n = n;
+  return hash.hash;
+}
+
+TEST(hashchain, empty)
+{
+  tools::hashchain hashchain;
+  ASSERT_EQ(hashchain.size(), 0);
+  ASSERT_EQ(hashchain.offset(), 0);
+}
+
+TEST(hashchain, genesis)
+{
+  tools::hashchain hashchain;
+  hashchain.push_back(make_hash(1));
+  ASSERT_EQ(hashchain.size(), 1);
+  ASSERT_EQ(hashchain.genesis(), make_hash(1));
+  hashchain.push_back(make_hash(2));
+  ASSERT_EQ(hashchain.size(), 2);
+  ASSERT_EQ(hashchain.genesis(), make_hash(1));
+}
+
+TEST(hashchain, push_back)
+{
+  tools::hashchain hashchain;
+  hashchain.push_back(make_hash(1));
+  hashchain.push_back(make_hash(2));
+  hashchain.push_back(make_hash(3));
+  ASSERT_EQ(hashchain[0], make_hash(1));
+  ASSERT_EQ(hashchain[1], make_hash(2));
+  ASSERT_EQ(hashchain[2], make_hash(3));
+}
+
+TEST(hashchain, clear_empty)
+{
+  tools::hashchain hashchain;
+  ASSERT_TRUE(hashchain.empty());
+  hashchain.push_back(make_hash(1));
+  ASSERT_FALSE(hashchain.empty());
+  hashchain.push_back(make_hash(2));
+  ASSERT_FALSE(hashchain.empty());
+  hashchain.clear();
+  ASSERT_TRUE(hashchain.empty());
+}
+
+TEST(hashchain, crop)
+{
+  tools::hashchain hashchain;
+  hashchain.push_back(make_hash(1));
+  hashchain.push_back(make_hash(2));
+  hashchain.push_back(make_hash(3));
+  ASSERT_EQ(hashchain.size(), 3);
+  ASSERT_EQ(hashchain[0], make_hash(1));
+  ASSERT_EQ(hashchain[1], make_hash(2));
+  ASSERT_EQ(hashchain[2], make_hash(3));
+  hashchain.crop(3);
+  ASSERT_EQ(hashchain.size(), 3);
+  hashchain.crop(2);
+  ASSERT_EQ(hashchain.size(), 2);
+  ASSERT_EQ(hashchain[0], make_hash(1));
+  ASSERT_EQ(hashchain[1], make_hash(2));
+  ASSERT_EQ(hashchain.genesis(), make_hash(1));
+  hashchain.crop(0);
+  ASSERT_TRUE(hashchain.empty());
+  ASSERT_EQ(hashchain.size(), 0);
+  hashchain.push_back(make_hash(5));
+  ASSERT_EQ(hashchain.genesis(), make_hash(5));
+  ASSERT_EQ(hashchain.size(), 1);
+}
+
+TEST(hashchain, trim)
+{
+  tools::hashchain hashchain;
+  hashchain.push_back(make_hash(1));
+  hashchain.push_back(make_hash(2));
+  hashchain.push_back(make_hash(3));
+  ASSERT_EQ(hashchain.offset(), 0);
+  hashchain.trim(2);
+  ASSERT_EQ(hashchain.offset(), 2);
+  ASSERT_EQ(hashchain.size(), 3);
+  ASSERT_EQ(hashchain[2], make_hash(3));
+  hashchain.trim(3);
+  ASSERT_EQ(hashchain.offset(), 3);
+  ASSERT_EQ(hashchain.size(), 3);
+  ASSERT_FALSE(hashchain.empty());
+  ASSERT_EQ(hashchain.genesis(), make_hash(1));
+}
diff --git a/tests/unit_tests/output_selection.cpp b/tests/unit_tests/output_selection.cpp
index ed436dffd..6ff73b107 100644
--- a/tests/unit_tests/output_selection.cpp
+++ b/tests/unit_tests/output_selection.cpp
@@ -42,7 +42,7 @@ static tools::wallet2::transfer_container make_transfers_container(size_t N)
     tools::wallet2::transfer_details &td = transfers.back();
     td.m_block_height = 1000;
     td.m_spent = false;
-    td.m_txid = cryptonote::null_hash;
+    td.m_txid = crypto::null_hash;
     td.m_txid.data[0] = n & 0xff;
     td.m_txid.data[1] = (n >> 8) & 0xff;
     td.m_txid.data[2] = (n >> 16) & 0xff;
diff --git a/tests/unit_tests/test_tx_utils.cpp b/tests/unit_tests/test_tx_utils.cpp
index 0ff91c247..4ce62e2f5 100644
--- a/tests/unit_tests/test_tx_utils.cpp
+++ b/tests/unit_tests/test_tx_utils.cpp
@@ -141,7 +141,7 @@ TEST(parse_and_validate_tx_extra, is_valid_tx_extra_parsed)
   cryptonote::blobdata b = "dsdsdfsdfsf";
   ASSERT_TRUE(cryptonote::construct_miner_tx(0, 0, 10000000000000, 1000, TEST_FEE, acc.get_keys().m_account_address, tx, b, 1));
   crypto::public_key tx_pub_key = cryptonote::get_tx_pub_key_from_extra(tx);
-  ASSERT_NE(tx_pub_key, cryptonote::null_pkey);
+  ASSERT_NE(tx_pub_key, crypto::null_pkey);
 }
 TEST(parse_and_validate_tx_extra, fails_on_big_extra_nonce)
 {