Moved BlockchainDB into its own src/ subfolder

Ostensibly janitorial work, but should be more relevant later down the
line.  Things that depend on core cryptonote things (i.e.
    cryptonote_core) don't necessarily depend on BlockchainDB and thus
have no need to have BlockchainDB baked in with them.

7 files changed, 7 insertions, 11 deletions

diff --git a/src/cryptonote_core/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp
index fc8aeef4e..8b08d3805 100644
--- a/src/cryptonote_core/blockchain_db.cpp
+++ b/src/blockchain_db/blockchain_db.cpp
@@ -26,8 +26,8 @@
 // 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 "cryptonote_core/blockchain_db.h"
-#include "cryptonote_format_utils.h"
+#include "blockchain_db.h"
+#include "cryptonote_core/cryptonote_format_utils.h"
 #include "profile_tools.h"
 
 using epee::string_tools::pod_to_hex;
diff --git a/src/cryptonote_core/blockchain_db.h b/src/blockchain_db/blockchain_db.h
index 2a7fa8f82..2a7fa8f82 100644
--- a/src/cryptonote_core/blockchain_db.h
+++ b/src/blockchain_db/blockchain_db.h
diff --git a/src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp
index feff4a272..feff4a272 100644
--- a/src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
diff --git a/src/cryptonote_core/BlockchainDB_impl/db_lmdb.h b/src/blockchain_db/lmdb/db_lmdb.h
index 0b4b5ec1a..f6582fce4 100644
--- a/src/cryptonote_core/BlockchainDB_impl/db_lmdb.h
+++ b/src/blockchain_db/lmdb/db_lmdb.h
@@ -25,7 +25,7 @@
 // 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 "cryptonote_core/blockchain_db.h"
+#include "blockchain_db/blockchain_db.h"
 #include "cryptonote_protocol/blobdatatype.h" // for type blobdata
 
 #include <lmdb.h>
diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt
index fc9cc629b..26122e367 100644
--- a/src/cryptonote_core/CMakeLists.txt
+++ b/src/cryptonote_core/CMakeLists.txt
@@ -30,8 +30,6 @@ set(cryptonote_core_sources
   account.cpp
   blockchain_storage.cpp
   blockchain.cpp
-  blockchain_db.cpp
-  BlockchainDB_impl/db_lmdb.cpp
   checkpoints.cpp
   checkpoints_create.cpp
   cryptonote_basic_impl.cpp
@@ -49,8 +47,6 @@ set(cryptonote_core_private_headers
   blockchain_storage.h
   blockchain_storage_boost_serialization.h
   blockchain.h
-  blockchain_db.h
-  BlockchainDB_impl/db_lmdb.h
   checkpoints.h
   checkpoints_create.h
   connection_context.h
@@ -76,6 +72,7 @@ target_link_libraries(cryptonote_core
   LINK_PUBLIC
     common
     crypto
+    blockchain_db
     ${Boost_DATE_TIME_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${Boost_SERIALIZATION_LIBRARY}
@@ -83,5 +80,4 @@ target_link_libraries(cryptonote_core
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}
-    ${LMDB_LIBRARY}
     ${EXTRA_LIBRARIES})
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index b2d979432..9f4895736 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -38,8 +38,8 @@
 #include "cryptonote_basic_impl.h"
 #include "tx_pool.h"
 #include "blockchain.h"
-#include "cryptonote_core/blockchain_db.h"
-#include "cryptonote_core/BlockchainDB_impl/db_lmdb.h"
+#include "blockchain_db/blockchain_db.h"
+#include "blockchain_db/lmdb/db_lmdb.h"
 #include "cryptonote_format_utils.h"
 #include "cryptonote_boost_serialization.h"
 #include "cryptonote_config.h"
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h
index 3e8a2de31..477aa4964 100644
--- a/src/cryptonote_core/blockchain.h
+++ b/src/cryptonote_core/blockchain.h
@@ -50,7 +50,7 @@
 #include "verification_context.h"
 #include "crypto/hash.h"
 #include "checkpoints.h"
-#include "blockchain_db.h"
+#include "blockchain_db/blockchain_db.h"
 
 namespace cryptonote
 {