From a95e460c7116589b5dedf5c966cb84893fe8d521 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Tue, 29 Aug 2017 11:14:42 +0100 Subject: [PATCH 1/2] move db specific options to BlockchainDB Avoids common depending on blockchain_db, which can cause link errors. --- src/blockchain_db/blockchain_db.cpp | 24 ++++++++++++++++++++++++ src/blockchain_db/blockchain_db.h | 11 +++++++++++ src/common/command_line.cpp | 17 ----------------- src/common/command_line.h | 3 --- src/cryptonote_core/cryptonote_core.cpp | 10 ++++------ src/daemon/main.cpp | 2 +- 6 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/blockchain_db/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp index 01a59e079..d62a250ff 100644 --- a/src/blockchain_db/blockchain_db.cpp +++ b/src/blockchain_db/blockchain_db.cpp @@ -78,6 +78,23 @@ std::string blockchain_db_types(const std::string& sep) return ret; } +std::string arg_db_type_description = "Specify database type, available: " + cryptonote::blockchain_db_types(", "); +const command_line::arg_descriptor arg_db_type = { + "db-type" +, arg_db_type_description.c_str() +, DEFAULT_DB_TYPE +}; +const command_line::arg_descriptor arg_db_sync_mode = { + "db-sync-mode" +, "Specify sync option, using format [safe|fast|fastest]:[sync|async]:[nblocks_per_sync]." +, "fast:async:1000" +}; +const command_line::arg_descriptor arg_db_salvage = { + "db-salvage" +, "Try to salvage a blockchain database if it seems corrupted" +, false +}; + BlockchainDB *new_db(const std::string& db_type) { if (db_type == "lmdb") @@ -89,6 +106,13 @@ BlockchainDB *new_db(const std::string& db_type) return NULL; } +void BlockchainDB::init_options(boost::program_options::options_description& desc) +{ + command_line::add_arg(desc, arg_db_type); + command_line::add_arg(desc, arg_db_sync_mode); + command_line::add_arg(desc, arg_db_salvage); +} + void BlockchainDB::pop_block() { block blk; diff --git a/src/blockchain_db/blockchain_db.h b/src/blockchain_db/blockchain_db.h index ad246d85e..85a494ce7 100644 --- a/src/blockchain_db/blockchain_db.h +++ b/src/blockchain_db/blockchain_db.h @@ -33,6 +33,8 @@ #include #include #include +#include +#include "common/command_line.h" #include "crypto/hash.h" #include "cryptonote_protocol/blobdatatype.h" #include "cryptonote_basic/cryptonote_basic.h" @@ -101,6 +103,10 @@ namespace cryptonote /** a pair of , typedef for convenience */ typedef std::pair tx_out_index; +extern const command_line::arg_descriptor arg_db_type; +extern const command_line::arg_descriptor arg_db_sync_mode; +extern const command_line::arg_descriptor arg_db_salvage; + #pragma pack(push, 1) /** @@ -535,6 +541,11 @@ public: */ virtual ~BlockchainDB() { }; + /** + * @brief init command line options + */ + static void init_options(boost::program_options::options_description& desc); + /** * @brief reset profiling stats */ diff --git a/src/common/command_line.cpp b/src/common/command_line.cpp index ad66b2009..8c03bed0d 100644 --- a/src/common/command_line.cpp +++ b/src/common/command_line.cpp @@ -32,7 +32,6 @@ #include #include #include -#include "blockchain_db/db_types.h" #include "common/i18n.h" #include "cryptonote_config.h" #include "string_tools.h" @@ -96,22 +95,6 @@ namespace command_line , "checkpoints from DNS server will be enforced" , false }; - std::string arg_db_type_description = "Specify database type, available: " + cryptonote::blockchain_db_types(", "); - const command_line::arg_descriptor arg_db_type = { - "db-type" - , arg_db_type_description.c_str() - , DEFAULT_DB_TYPE - }; - const command_line::arg_descriptor arg_db_sync_mode = { - "db-sync-mode" - , "Specify sync option, using format [safe|fast|fastest]:[sync|async]:[nblocks_per_sync]." - , "fast:async:1000" - }; - const arg_descriptor arg_db_salvage = { - "db-salvage" - , "Try to salvage a blockchain database if it seems corrupted" - , false - }; const command_line::arg_descriptor arg_fast_block_sync = { "fast-block-sync" , "Sync up most of the way by using embedded, known block hashes." diff --git a/src/common/command_line.h b/src/common/command_line.h index 03ba35a5b..ac64f519c 100644 --- a/src/common/command_line.h +++ b/src/common/command_line.h @@ -212,9 +212,6 @@ namespace command_line extern const arg_descriptor arg_test_dbg_lock_sleep; extern const arg_descriptor arg_testnet_on; extern const arg_descriptor arg_dns_checkpoints; - extern const arg_descriptor arg_db_type; - extern const arg_descriptor arg_db_sync_mode; - extern const arg_descriptor arg_db_salvage; extern const arg_descriptor arg_fast_block_sync; extern const arg_descriptor arg_prep_blocks_threads; extern const arg_descriptor arg_show_time_stats; diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index c406dd0b4..e58cf7424 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -156,11 +156,8 @@ namespace cryptonote command_line::add_arg(desc, command_line::arg_testnet_on); command_line::add_arg(desc, command_line::arg_dns_checkpoints); - command_line::add_arg(desc, command_line::arg_db_type); command_line::add_arg(desc, command_line::arg_prep_blocks_threads); command_line::add_arg(desc, command_line::arg_fast_block_sync); - command_line::add_arg(desc, command_line::arg_db_sync_mode); - command_line::add_arg(desc, command_line::arg_db_salvage); command_line::add_arg(desc, command_line::arg_show_time_stats); command_line::add_arg(desc, command_line::arg_block_sync_size); command_line::add_arg(desc, command_line::arg_check_updates); @@ -170,6 +167,7 @@ namespace cryptonote command_line::add_arg(desc, nodetool::arg_p2p_bind_port, false); miner::init_options(desc); + BlockchainDB::init_options(desc); } //----------------------------------------------------------------------------------------------- bool core::handle_command_line(const boost::program_options::variables_map& vm) @@ -279,9 +277,9 @@ namespace cryptonote m_config_folder_mempool = m_config_folder_mempool + "/" + m_port; } - std::string db_type = command_line::get_arg(vm, command_line::arg_db_type); - std::string db_sync_mode = command_line::get_arg(vm, command_line::arg_db_sync_mode); - bool db_salvage = command_line::get_arg(vm, command_line::arg_db_salvage) != 0; + std::string db_type = command_line::get_arg(vm, cryptonote::arg_db_type); + std::string db_sync_mode = command_line::get_arg(vm, cryptonote::arg_db_sync_mode); + bool db_salvage = command_line::get_arg(vm, cryptonote::arg_db_salvage) != 0; bool fast_sync = command_line::get_arg(vm, command_line::arg_fast_block_sync) != 0; uint64_t blocks_threads = command_line::get_arg(vm, command_line::arg_prep_blocks_threads); std::string check_updates_string = command_line::get_arg(vm, command_line::arg_check_updates); diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp index 456eeee64..44d2dae43 100644 --- a/src/daemon/main.cpp +++ b/src/daemon/main.cpp @@ -142,7 +142,7 @@ int main(int argc, char const * argv[]) epee::debug::g_test_dbg_lock_sleep() = command_line::get_arg(vm, command_line::arg_test_dbg_lock_sleep); - std::string db_type = command_line::get_arg(vm, command_line::arg_db_type); + std::string db_type = command_line::get_arg(vm, cryptonote::arg_db_type); // verify that blockchaindb type is valid if(!cryptonote::blockchain_valid_db_type(db_type)) From 3d19ab7067f86331d15c07e8cfe1f0a87d6832ed Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 29 Aug 2017 13:05:22 +0100 Subject: [PATCH 2/2] Revert "Cleanup test impact of moving blockchain_db_types()" This reverts commit 3dd34a49efd2954b0a5eb020abd168d9379b98c4. --- src/debug_utilities/CMakeLists.txt | 1 - tests/core_proxy/CMakeLists.txt | 2 -- tests/fuzz/CMakeLists.txt | 10 ---------- 3 files changed, 13 deletions(-) diff --git a/src/debug_utilities/CMakeLists.txt b/src/debug_utilities/CMakeLists.txt index e6d49fd61..99198dc57 100644 --- a/src/debug_utilities/CMakeLists.txt +++ b/src/debug_utilities/CMakeLists.txt @@ -37,7 +37,6 @@ monero_add_executable(cn_deserialize target_link_libraries(cn_deserialize LINK_PRIVATE cryptonote_core - common blockchain_db p2p epee diff --git a/tests/core_proxy/CMakeLists.txt b/tests/core_proxy/CMakeLists.txt index 680e34911..d22fecc9c 100644 --- a/tests/core_proxy/CMakeLists.txt +++ b/tests/core_proxy/CMakeLists.txt @@ -39,8 +39,6 @@ target_link_libraries(core_proxy PRIVATE cryptonote_core cryptonote_protocol - common - blockchain_db p2p epee ${CMAKE_THREAD_LIBS_INIT} diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt index cb77f8f56..853d46a12 100644 --- a/tests/fuzz/CMakeLists.txt +++ b/tests/fuzz/CMakeLists.txt @@ -30,8 +30,6 @@ add_executable(block_fuzz_tests block.cpp fuzzer.cpp) target_link_libraries(block_fuzz_tests PRIVATE cryptonote_core - common - blockchain_db p2p epee ${CMAKE_THREAD_LIBS_INIT} @@ -44,8 +42,6 @@ add_executable(transaction_fuzz_tests transaction.cpp fuzzer.cpp) target_link_libraries(transaction_fuzz_tests PRIVATE cryptonote_core - common - blockchain_db p2p epee ${CMAKE_THREAD_LIBS_INIT} @@ -59,8 +55,6 @@ target_link_libraries(signature_fuzz_tests PRIVATE wallet cryptonote_core - common - blockchain_db p2p epee ${CMAKE_THREAD_LIBS_INIT} @@ -74,8 +68,6 @@ target_link_libraries(cold-outputs_fuzz_tests PRIVATE wallet cryptonote_core - common - blockchain_db p2p epee ${CMAKE_THREAD_LIBS_INIT} @@ -89,8 +81,6 @@ target_link_libraries(cold-transaction_fuzz_tests PRIVATE wallet cryptonote_core - common - blockchain_db p2p epee ${CMAKE_THREAD_LIBS_INIT}