aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/blockchain.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-02-11 00:20:40 +0200
committerRiccardo Spagni <ric@spagni.net>2017-02-11 00:20:41 +0200
commitd1b31c0f45168b1481f64a97653fd7fd8b95c661 (patch)
tree40066ffa7c7afb28907291c93863d8cfdb14920c /src/cryptonote_core/blockchain.cpp
parentMerge pull request #1679 (diff)
parentextract some basic code from libcryptonote_core into libcryptonote_basic (diff)
downloadmonero-d1b31c0f45168b1481f64a97653fd7fd8b95c661.tar.xz
Merge pull request #1626
8027ce0c extract some basic code from libcryptonote_core into libcryptonote_basic (kenshi84)
Diffstat (limited to 'src/cryptonote_core/blockchain.cpp')
-rw-r--r--src/cryptonote_core/blockchain.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index b344c5597..a81286632 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -34,14 +34,13 @@
#include <boost/range/adaptor/reversed.hpp>
#include "include_base_utils.h"
-#include "cryptonote_basic_impl.h"
+#include "cryptonote_basic/cryptonote_basic_impl.h"
#include "tx_pool.h"
#include "blockchain.h"
#include "blockchain_db/blockchain_db.h"
-#include "cryptonote_format_utils.h"
-#include "cryptonote_boost_serialization.h"
+#include "cryptonote_basic/cryptonote_boost_serialization.h"
#include "cryptonote_config.h"
-#include "miner.h"
+#include "cryptonote_basic/miner.h"
#include "misc_language.h"
#include "profile_tools.h"
#include "file_io_utils.h"
@@ -49,8 +48,8 @@
#include "common/boost_serialization_helper.h"
#include "warnings.h"
#include "crypto/hash.h"
-#include "cryptonote_core/checkpoints.h"
-#include "cryptonote_core/cryptonote_core.h"
+#include "cryptonote_basic/checkpoints.h"
+#include "cryptonote_core.h"
#include "ringct/rctSigs.h"
#include "common/perf_timer.h"
#if defined(PER_BLOCK_CHECKPOINT)