fix dependency: put HardFork back to cryptonote_basic, made some BlockchainDB functions virtual again to avoid missing symbols error

8 files changed, 10 insertions, 10 deletions

diff --git a/src/blockchain_db/blockchain_db.h b/src/blockchain_db/blockchain_db.h
index 674b844c1..f5710550b 100644
--- a/src/blockchain_db/blockchain_db.h
+++ b/src/blockchain_db/blockchain_db.h
@@ -37,7 +37,7 @@
 #include "cryptonote_protocol/blobdatatype.h"
 #include "cryptonote_basic/cryptonote_basic.h"
 #include "cryptonote_basic/difficulty.h"
-#include "cryptonote_core/hardfork.h"
+#include "cryptonote_basic/hardfork.h"
 
 /** \file
  * Cryptonote Blockchain Database Interface
@@ -768,7 +768,7 @@ public:
    *
    * @return the block requested
    */
-  block get_block(const crypto::hash& h) const;
+  virtual block get_block(const crypto::hash& h) const;
 
   /**
    * @brief gets the height of the block with a given hash
@@ -821,7 +821,7 @@ public:
    *
    * @return the block
    */
-  block get_block_from_height(const uint64_t& height) const;
+  virtual block get_block_from_height(const uint64_t& height) const;
 
   /**
    * @brief fetch a block's timestamp
@@ -1041,7 +1041,7 @@ public:
    *
    * @return the transaction with the given hash
    */
-  transaction get_tx(const crypto::hash& h) const;
+  virtual transaction get_tx(const crypto::hash& h) const;
 
   /**
    * @brief fetches the transaction with the given hash
@@ -1052,7 +1052,7 @@ public:
    *
    * @return true iff the transaction was found
    */
-  bool get_tx(const crypto::hash& h, transaction &tx) const;
+  virtual bool get_tx(const crypto::hash& h, transaction &tx) const;
 
   /**
    * @brief fetches the transaction blob with the given hash
diff --git a/src/cryptonote_basic/CMakeLists.txt b/src/cryptonote_basic/CMakeLists.txt
index db478c690..2b8ad365a 100644
--- a/src/cryptonote_basic/CMakeLists.txt
+++ b/src/cryptonote_basic/CMakeLists.txt
@@ -32,6 +32,7 @@ set(cryptonote_basic_sources
   cryptonote_basic_impl.cpp
   cryptonote_format_utils.cpp
   difficulty.cpp
+  hardfork.cpp
   miner.cpp)
 
 set(cryptonote_basic_headers)
@@ -47,6 +48,7 @@ set(cryptonote_basic_private_headers
   cryptonote_format_utils.h
   cryptonote_stat_info.h
   difficulty.h
+  hardfork.h
   miner.h
   tx_extra.h
   verification_context.h)
diff --git a/src/cryptonote_core/hardfork.cpp b/src/cryptonote_basic/hardfork.cpp
index 546af2076..546af2076 100644
--- a/src/cryptonote_core/hardfork.cpp
+++ b/src/cryptonote_basic/hardfork.cpp
diff --git a/src/cryptonote_core/hardfork.h b/src/cryptonote_basic/hardfork.h
index 6c6fbcb84..6c6fbcb84 100644
--- a/src/cryptonote_core/hardfork.h
+++ b/src/cryptonote_basic/hardfork.h
diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt
index 8a72dd259..5944ddcd1 100644
--- a/src/cryptonote_core/CMakeLists.txt
+++ b/src/cryptonote_core/CMakeLists.txt
@@ -30,7 +30,6 @@ set(cryptonote_core_sources
   blockchain.cpp
   cryptonote_core.cpp
   tx_pool.cpp
-  hardfork.cpp
   cryptonote_tx_utils.cpp)
 
 set(cryptonote_core_headers)
@@ -38,7 +37,6 @@ set(cryptonote_core_headers)
 set(cryptonote_core_private_headers
   blockchain_storage_boost_serialization.h
   blockchain.h
-  hardfork.h
   cryptonote_core.h
   tx_pool.h
   cryptonote_tx_utils.h)
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h
index 6e4ba5e2a..2c7420e18 100644
--- a/src/cryptonote_core/blockchain.h
+++ b/src/cryptonote_core/blockchain.h
@@ -51,7 +51,7 @@
 #include "cryptonote_basic/verification_context.h"
 #include "crypto/hash.h"
 #include "cryptonote_basic/checkpoints.h"
-#include "cryptonote_core/hardfork.h"
+#include "cryptonote_basic/hardfork.h"
 #include "blockchain_db/blockchain_db.h"
 
 namespace cryptonote
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
index 80109c791..e9f95ae6b 100644
--- a/src/daemon/rpc_command_executor.cpp
+++ b/src/daemon/rpc_command_executor.cpp
@@ -34,7 +34,7 @@
 #include "daemon/rpc_command_executor.h"
 #include "rpc/core_rpc_server_commands_defs.h"
 #include "cryptonote_core/cryptonote_core.h"
-#include "cryptonote_core/hardfork.h"
+#include "cryptonote_basic/hardfork.h"
 #include <boost/format.hpp>
 #include <ctime>
 #include <string>
diff --git a/tests/unit_tests/hardfork.cpp b/tests/unit_tests/hardfork.cpp
index 512216ded..08c4276c8 100644
--- a/tests/unit_tests/hardfork.cpp
+++ b/tests/unit_tests/hardfork.cpp
@@ -33,7 +33,7 @@
 
 #include "blockchain_db/lmdb/db_lmdb.h"
 #include "cryptonote_basic/cryptonote_format_utils.h"
-#include "cryptonote_core/hardfork.h"
+#include "cryptonote_basic/hardfork.h"
 
 using namespace cryptonote;