monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
kenshi84 2017-03-10 10:20:38 +09:00
parent b67877af6f
commit 7d07c64fe5
No known key found for this signature in database
GPG key ID: 2EDF47F7E1A26933
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/blockchain_db/blockchain_db.h
View file

@ -37,7 +37,7 @@
#include "cryptonote_protocol/blobdatatype.h" #include "cryptonote_protocol/blobdatatype.h"
#include "cryptonote_basic/cryptonote_basic.h" #include "cryptonote_basic/cryptonote_basic.h"
#include "cryptonote_basic/difficulty.h" #include "cryptonote_basic/difficulty.h"
#include "cryptonote_core/hardfork.h" #include "cryptonote_basic/hardfork.h"
/** \file /** \file
* Cryptonote Blockchain Database Interface * Cryptonote Blockchain Database Interface
@ -768,7 +768,7 @@ public:
* *
* @return the block requested * @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 * @brief gets the height of the block with a given hash
@ -821,7 +821,7 @@ public:
* *
* @return the block * @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 * @brief fetch a block's timestamp
@ -1041,7 +1041,7 @@ public:
* *
* @return the transaction with the given hash * @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 * @brief fetches the transaction with the given hash
@ -1052,7 +1052,7 @@ public:
* *
* @return true iff the transaction was found * @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 * @brief fetches the transaction blob with the given hash

2
src/cryptonote_basic/CMakeLists.txt
View file

@ -32,6 +32,7 @@ set(cryptonote_basic_sources
cryptonote_basic_impl.cpp cryptonote_basic_impl.cpp
cryptonote_format_utils.cpp cryptonote_format_utils.cpp
difficulty.cpp difficulty.cpp
hardfork.cpp
miner.cpp) miner.cpp)
set(cryptonote_basic_headers) set(cryptonote_basic_headers)
@ -47,6 +48,7 @@ set(cryptonote_basic_private_headers
cryptonote_format_utils.h cryptonote_format_utils.h
cryptonote_stat_info.h cryptonote_stat_info.h
difficulty.h difficulty.h
hardfork.h
miner.h miner.h
tx_extra.h tx_extra.h
verification_context.h) verification_context.h)

0
src/cryptonote_core/hardfork.cpp → src/cryptonote_basic/hardfork.cpp
View file

0
src/cryptonote_core/hardfork.h → src/cryptonote_basic/hardfork.h
View file

2
src/cryptonote_core/CMakeLists.txt
View file

@ -30,7 +30,6 @@ set(cryptonote_core_sources
blockchain.cpp blockchain.cpp
cryptonote_core.cpp cryptonote_core.cpp
tx_pool.cpp tx_pool.cpp
hardfork.cpp
cryptonote_tx_utils.cpp) cryptonote_tx_utils.cpp)
set(cryptonote_core_headers) set(cryptonote_core_headers)
@ -38,7 +37,6 @@ set(cryptonote_core_headers)
set(cryptonote_core_private_headers set(cryptonote_core_private_headers
blockchain_storage_boost_serialization.h blockchain_storage_boost_serialization.h
blockchain.h blockchain.h
hardfork.h
cryptonote_core.h cryptonote_core.h
tx_pool.h tx_pool.h
cryptonote_tx_utils.h) cryptonote_tx_utils.h)

2
src/cryptonote_core/blockchain.h
View file

@ -51,7 +51,7 @@
#include "cryptonote_basic/verification_context.h" #include "cryptonote_basic/verification_context.h"
#include "crypto/hash.h" #include "crypto/hash.h"
#include "cryptonote_basic/checkpoints.h" #include "cryptonote_basic/checkpoints.h"
#include "cryptonote_core/hardfork.h" #include "cryptonote_basic/hardfork.h"
#include "blockchain_db/blockchain_db.h" #include "blockchain_db/blockchain_db.h"
namespace cryptonote namespace cryptonote

2
src/daemon/rpc_command_executor.cpp
View file

@ -34,7 +34,7 @@
#include "daemon/rpc_command_executor.h" #include "daemon/rpc_command_executor.h"
#include "rpc/core_rpc_server_commands_defs.h" #include "rpc/core_rpc_server_commands_defs.h"
#include "cryptonote_core/cryptonote_core.h" #include "cryptonote_core/cryptonote_core.h"
#include "cryptonote_core/hardfork.h" #include "cryptonote_basic/hardfork.h"
#include <boost/format.hpp> #include <boost/format.hpp>
#include <ctime> #include <ctime>
#include <string> #include <string>

2
tests/unit_tests/hardfork.cpp
View file

@ -33,7 +33,7 @@
#include "blockchain_db/lmdb/db_lmdb.h" #include "blockchain_db/lmdb/db_lmdb.h"
#include "cryptonote_basic/cryptonote_format_utils.h" #include "cryptonote_basic/cryptonote_format_utils.h"
#include "cryptonote_core/hardfork.h" #include "cryptonote_basic/hardfork.h"
using namespace cryptonote; using namespace cryptonote;