Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-07-27 00:55:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

More DB support cleanup

Browse source 
Hide DB types from db_types.h - no reason to recompile dependencies
when DB types change.

Also remove lingering in-memory DB references, they've been
obsolete since 9e82b694da
This commit is contained in:
Howard Chu 2017-08-20 13:37:19 +01:00
parent 4c7f8ac04f
commit 80344740bd
No known key found for this signature in database
GPG key ID: FD2A70B44AB11BA7
6 changed files with 42 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/blockchain_utilities/blockchain_export.cpp
View file

@ -40,17 +40,6 @@
namespace po = boost::program_options;
using namespace epee;
std::string join_set_strings(const std::unordered_set<std::string>& db_types_all, const char* delim)
{
std::string result;
std::ostringstream s;
std::copy(db_types_all.begin(), db_types_all.end(), std::ostream_iterator<std::string>(s, delim));
result = s.str();
if (result.length() > 0)
result.erase(result.end()-strlen(delim), result.end());
return result;
}
int main(int argc, char* argv[])
{
TRY_ENTRY();
@ -59,10 +48,7 @@ int main(int argc, char* argv[])
std::string default_db_type = "lmdb";
std::unordered_set<std::string> db_types_all = cryptonote::blockchain_db_types;
db_types_all.insert("memory");
std::string available_dbs = join_set_strings(db_types_all, ", ");
std::string available_dbs = cryptonote::blockchain_db_types(", ");
available_dbs = "available: " + available_dbs;
uint32_t log_level = 0;
@ -140,7 +126,7 @@ int main(int argc, char* argv[])
m_config_folder = command_line::get_arg(vm, data_dir_arg);
std::string db_type = command_line::get_arg(vm, arg_database);
if (db_types_all.count(db_type) == 0)
if (!cryptonote::blockchain_valid_db_type(db_type))
{
std::cerr << "Invalid database type: " << db_type << std::endl;
return 1;