6 files changed, 13 insertions, 182 deletions
diff --git a/tests/core_proxy/core_proxy.h b/tests/core_proxy/core_proxy.h
index b7d5725f0..85518612a 100644
--- a/tests/core_proxy/core_proxy.h
+++ b/tests/core_proxy/core_proxy.h
@@ -66,6 +66,7 @@ namespace tests
 
   public:
     void on_synchronized(){}
+    void safesyncmode(const bool){}
     uint64_t get_current_blockchain_height(){return 1;}
     void set_target_blockchain_height(uint64_t) {}
     bool init(const boost::program_options::variables_map& vm);
@@ -88,7 +89,7 @@ namespace tests
     bool prepare_handle_incoming_blocks(const std::list<cryptonote::block_complete_entry>  &blocks) { return true; }
     bool cleanup_handle_incoming_blocks(bool force_sync = false) { return true; }
     uint64_t get_target_blockchain_height() const { return 1; }
-    size_t get_block_sync_size() const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; }
+    size_t get_block_sync_size(uint64_t height) const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; }
     virtual void on_transaction_relayed(const cryptonote::blobdata& tx) {}
     bool get_testnet() const { return false; }
     bool get_pool_transaction(const crypto::hash& id, cryptonote::blobdata& tx_blob) const { return false; }
@@ -98,5 +99,7 @@ namespace tests
     bool get_block_by_hash(const crypto::hash &h, cryptonote::block &blk, bool *orphan = NULL) const { return false; }
     uint8_t get_ideal_hard_fork_version(uint64_t height) const { return 0; }
     uint8_t get_hard_fork_version(uint64_t height) const { return 0; }
+    cryptonote::difficulty_type get_block_cumulative_difficulty(uint64_t height) const { return 0; }
+    bool fluffy_blocks_enabled() const { return false; }
   };
 }
diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt
index 2f62dc2aa..f5e08b102 100644
--- a/tests/unit_tests/CMakeLists.txt
+++ b/tests/unit_tests/CMakeLists.txt
@@ -55,7 +55,6 @@ set(unit_tests_sources
   test_tx_utils.cpp
   test_peerlist.cpp
   test_protocol_pack.cpp
-  thread_group.cpp
   hardfork.cpp
   unbound.cpp
   uri.cpp
diff --git a/tests/unit_tests/ban.cpp b/tests/unit_tests/ban.cpp
index 6fc8b83dd..82ff058b1 100644
--- a/tests/unit_tests/ban.cpp
+++ b/tests/unit_tests/ban.cpp
@@ -43,6 +43,7 @@ class test_core
 {
 public:
   void on_synchronized(){}
+  void safesyncmode(const bool){}
   uint64_t get_current_blockchain_height() const {return 1;}
   void set_target_blockchain_height(uint64_t) {}
   bool init(const boost::program_options::variables_map& vm) {return true ;}
@@ -65,7 +66,7 @@ public:
   bool prepare_handle_incoming_blocks(const std::list<cryptonote::block_complete_entry>  &blocks) { return true; }
   bool cleanup_handle_incoming_blocks(bool force_sync = false) { return true; }
   uint64_t get_target_blockchain_height() const { return 1; }
-  size_t get_block_sync_size() const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; }
+  size_t get_block_sync_size(uint64_t height) const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; }
   virtual void on_transaction_relayed(const cryptonote::blobdata& tx) {}
   bool get_testnet() const { return false; }
   bool get_pool_transaction(const crypto::hash& id, cryptonote::blobdata& tx_blob) const { return false; }
@@ -75,6 +76,8 @@ public:
   bool get_block_by_hash(const crypto::hash &h, cryptonote::block &blk, bool *orphan = NULL) const { return false; }
   uint8_t get_ideal_hard_fork_version(uint64_t height) const { return 0; }
   uint8_t get_hard_fork_version(uint64_t height) const { return 0; }
+  cryptonote::difficulty_type get_block_cumulative_difficulty(uint64_t height) const { return 0; }
+  bool fluffy_blocks_enabled() const { return false; }
 };
 
 typedef nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<test_core>> Server;
diff --git a/tests/unit_tests/hardfork.cpp b/tests/unit_tests/hardfork.cpp
index febf8b2f7..c30feb461 100644
--- a/tests/unit_tests/hardfork.cpp
+++ b/tests/unit_tests/hardfork.cpp
@@ -31,7 +31,7 @@
 #include <algorithm>
 #include "gtest/gtest.h"
 
-#include "blockchain_db/lmdb/db_lmdb.h"
+#include "blockchain_db/blockchain_db.h"
 #include "cryptonote_basic/cryptonote_format_utils.h"
 #include "cryptonote_basic/hardfork.h"
 
@@ -47,6 +47,7 @@ public:
   virtual void open(const std::string& filename, const int db_flags = 0) { }
   virtual void close() {}
   virtual void sync() {}
+  virtual void safesyncmode(const bool onoff) {}
   virtual void reset() {}
   virtual std::vector<std::string> get_filenames() const { return std::vector<std::string>(); }
   virtual std::string get_db_name() const { return std::string(); }
diff --git a/tests/unit_tests/mnemonics.cpp b/tests/unit_tests/mnemonics.cpp
index 553dcfb86..05894adf4 100644
--- a/tests/unit_tests/mnemonics.cpp
+++ b/tests/unit_tests/mnemonics.cpp
@@ -44,6 +44,7 @@
 #include "mnemonics/russian.h"
 #include "mnemonics/french.h"
 #include "mnemonics/dutch.h"
+#include "mnemonics/esperanto.h"
 #include "mnemonics/english_old.h"
 #include "mnemonics/language_base.h"
 #include "mnemonics/singleton.h"
@@ -165,7 +166,8 @@ TEST(mnemonics, all_languages)
     Language::Singleton<Language::Italian>::instance(),
     Language::Singleton<Language::Russian>::instance(),
     Language::Singleton<Language::French>::instance(),
-    Language::Singleton<Language::Dutch>::instance()
+    Language::Singleton<Language::Dutch>::instance(),
+    Language::Singleton<Language::Esperanto>::instance()
   });
 
   for (std::vector<Language::Base*>::iterator it = languages.begin(); it != languages.end(); it++)
diff --git a/tests/unit_tests/thread_group.cpp b/tests/unit_tests/thread_group.cpp
deleted file mode 100644
index c0ba3d38b..000000000
--- a/tests/unit_tests/thread_group.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// 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.
-
-#include "gtest/gtest.h"
-
-#include <atomic>
-#include "common/task_region.h"
-#include "common/thread_group.h"
-
-TEST(ThreadGroup, NoThreads)
-{
-  tools::task_region(tools::thread_group(0), [] (tools::task_region_handle& region) {
-    std::atomic<bool> completed{false};
-    region.run([&] { completed = true; });
-    EXPECT_TRUE(completed);
-  });
-  {
-    tools::thread_group group(0);
-    std::atomic<bool> completed{false};
-    group.dispatch([&] { completed = true; });
-    EXPECT_TRUE(completed);
-  }
-}
-
-TEST(ThreadGroup, OneThread)
-{
-  tools::thread_group group(1);
-
-  for (unsigned i = 0; i < 3; ++i) {
-    std::atomic<bool> completed{false};
-    tools::task_region(group, [&] (tools::task_region_handle& region) {
-      region.run([&] { completed = true; });
-    });
-    EXPECT_TRUE(completed);
-  }
-}
-
-
-TEST(ThreadGroup, UseActiveThreadOnSync)
-{
-  tools::thread_group group(1);
-
-  for (unsigned i = 0; i < 3; ++i) {
-    std::atomic<bool> completed{false};
-    tools::task_region(group, [&] (tools::task_region_handle& region) {
-      region.run([&] { while (!completed); });
-      region.run([&] { completed = true; });
-    });
-    EXPECT_TRUE(completed);
-  }
-}
-
-TEST(ThreadGroup, InOrder)
-{
-  tools::thread_group group(1);
-
-  for (unsigned i = 0; i < 3; ++i) {
-    std::atomic<unsigned> count{0};
-    std::atomic<bool> completed{false};
-    tools::task_region(group, [&] (tools::task_region_handle& region) {
-      region.run([&] { while (!completed); });
-      region.run([&] { if (count == 0) completed = true; });
-      region.run([&] { ++count; });
-    });
-    EXPECT_TRUE(completed);
-    EXPECT_EQ(1u, count);
-  }
-}
-
-TEST(ThreadGroup, TwoThreads)
-{
-  tools::thread_group group(2);
-
-  for (unsigned i = 0; i < 3; ++i) {
-    std::atomic<bool> completed{false};
-    tools::task_region(group, [&] (tools::task_region_handle& region) {
-      region.run([&] { while (!completed); });
-      region.run([&] { while (!completed); });
-      region.run([&] { completed = true; });
-    });
-    EXPECT_TRUE(completed);
-  }
-}
-
-TEST(ThreadGroup, Nested) {
-  struct fib {
-    unsigned operator()(tools::thread_group& group, unsigned value) const {
-      if (value == 0 || value == 1) {
-        return value;
-      }
-      unsigned left = 0;
-      unsigned right = 0;
-      tools::task_region(group, [&, value] (tools::task_region_handle& region) {
-        region.run([&, value] { left = fib{}(group, value - 1); });
-        region.run([&, value] { right = fib{}(group, value - 2); } );
-      });
-      return left + right;
-    }
-
-    unsigned operator()(tools::thread_group&& group, unsigned value) const {
-      return (*this)(group, value);
-    }
-  };
-  // be careful of depth on asynchronous version
-  EXPECT_EQ(6765, fib{}(tools::thread_group(0), 20));
-  EXPECT_EQ(377, fib{}(tools::thread_group(1), 14));
-}
-
-TEST(ThreadGroup, Many)
-{
-  tools::thread_group group(1);
-
-  for (unsigned i = 0; i < 3; ++i) {
-    std::atomic<unsigned> count{0};
-    tools::task_region(group, [&] (tools::task_region_handle& region) {
-      for (unsigned tasks = 0; tasks < 1000; ++tasks) {
-        region.run([&] { ++count; });
-      }
-    });
-    EXPECT_EQ(1000u, count);
-  }
-}
-
-TEST(ThreadGroup, ThrowInTaskRegion)
-{
-  class test_exception final : std::exception {
-  public:
-    explicit test_exception() : std::exception() {}
-
-    virtual const char* what() const noexcept override {
-      return "test_exception";
-    }
-  };
-
-  tools::thread_group group(1);
-
-  for (unsigned i = 0; i < 3; ++i) {
-    std::atomic<unsigned> count{0};
-    EXPECT_THROW(
-      [&] {
-        tools::task_region(group, [&] (tools::task_region_handle& region) {
-          for (unsigned tasks = 0; tasks < 1000; ++tasks) {
-            region.run([&] { ++count; });
-          }
-          throw test_exception();
-        });
-      }(),
-      test_exception
-    );
-    EXPECT_GE(1000u, count);
-  }
-}