Merge pull request #5878

f9b3f6e Removed Berkeley DB and db switching logic (JesusRami)
This commit is contained in:
luigi1111 2019-09-24 10:10:28 -05:00
commit 06bee964a8
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
20 changed files with 35 additions and 3188 deletions

View file

@ -44,7 +44,6 @@
#include "rpc/core_rpc_server.h"
#include "rpc/rpc_args.h"
#include "daemon/command_line_args.h"
#include "blockchain_db/db_types.h"
#include "version.h"
#ifdef STACK_TRACE
@ -224,16 +223,6 @@ int main(int argc, char const * argv[])
return 1;
}
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))
{
std::cout << "Invalid database type (" << db_type << "), available types are: " <<
cryptonote::blockchain_db_types(", ") << std::endl;
return 0;
}
// data_dir
// default: e.g. ~/.bitmonero/ or ~/.bitmonero/testnet
// if data-dir argument given: