Merge pull request #1804

12adb4a3 core: move hardfork back to cryptonote_core (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-03-03 14:11:09 +02:00
commit 3787ffca80
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
8 changed files with 10 additions and 10 deletions

View file

@ -37,7 +37,7 @@
#include "cryptonote_protocol/blobdatatype.h"
#include "cryptonote_basic/cryptonote_basic.h"
#include "cryptonote_basic/difficulty.h"
#include "cryptonote_basic/hardfork.h"
#include "cryptonote_core/hardfork.h"
/** \file
* Cryptonote Blockchain Database Interface

View file

@ -32,8 +32,7 @@ set(cryptonote_basic_sources
cryptonote_basic_impl.cpp
cryptonote_format_utils.cpp
difficulty.cpp
miner.cpp
hardfork.cpp)
miner.cpp)
set(cryptonote_basic_headers)
@ -50,8 +49,7 @@ set(cryptonote_basic_private_headers
difficulty.h
miner.h
tx_extra.h
verification_context.h
hardfork.h)
verification_context.h)
monero_private_headers(cryptonote_basic
${crypto_private_headers})

View file

@ -30,6 +30,7 @@ set(cryptonote_core_sources
blockchain.cpp
cryptonote_core.cpp
tx_pool.cpp
hardfork.cpp
cryptonote_tx_utils.cpp)
set(cryptonote_core_headers)
@ -37,6 +38,7 @@ 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)

View file

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

View file

@ -29,7 +29,7 @@
#include <algorithm>
#include <cstdio>
#include "cryptonote_basic.h"
#include "cryptonote_basic/cryptonote_basic.h"
#include "blockchain_db/blockchain_db.h"
#include "hardfork.h"

View file

@ -29,7 +29,7 @@
#pragma once
#include "syncobj.h"
#include "cryptonote_basic.h"
#include "cryptonote_basic/cryptonote_basic.h"
namespace cryptonote
{

View file

@ -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_basic/hardfork.h"
#include "cryptonote_core/hardfork.h"
#include <boost/format.hpp>
#include <ctime>
#include <string>

View file

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