gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-22 07:10:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2589

Browse Source 
8f0cea63 add a command_line function to check for defaulted options (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2017-10-15 18:38:46 +02:00
parent 3eac7ab94f 8f0cea6355
commit 1280ba4f5b
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blockchain_utilities/blockchain_import.cpp
View File

@@ -651,7 +651,7 @@ int main(int argc, char* argv[])
return 1;
}
if (! opt_batch && ! vm["batch-size"].defaulted())
if (! opt_batch && !command_line::is_arg_defaulted(vm, arg_batch_size))
{
std::cerr << "Error: batch-size set, but batch option not enabled" << ENDL;
return 1;
@@ -661,7 +661,7 @@ int main(int argc, char* argv[])
std::cerr << "Error: batch-size must be > 0" << ENDL;
return 1;
}
if (opt_verify && vm["batch-size"].defaulted())
if (opt_verify && command_line::is_arg_defaulted(vm, arg_batch_size))
{
// usually want batch size default lower if verify on, so progress can be
// frequently saved.
@@ -680,7 +680,7 @@ int main(int argc, char* argv[])
db_arg_str = command_line::get_arg(vm, arg_database);
mlog_configure(mlog_get_default_log_path("monero-blockchain-import.log"), true);
if (!vm["log-level"].defaulted())
if (!command_line::is_arg_defaulted(vm, arg_log_level))
mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
else
mlog_set_log(std::string(std::to_string(log_level) + ",bcutil:INFO").c_str());
@@ -752,7 +752,7 @@ int main(int argc, char* argv[])
}
core.get_blockchain_storage().get_db().set_batch_transactions(true);
if (! vm["pop-blocks"].defaulted())
if (!command_line::is_arg_defaulted(vm, arg_pop_blocks))
{
num_blocks = command_line::get_arg(vm, arg_pop_blocks);
MINFO("height: " << core.get_blockchain_storage().get_current_blockchain_height());
@@ -761,7 +761,7 @@ int main(int argc, char* argv[])
return 0;
}
if (! vm["drop-hard-fork"].defaulted())
if (!command_line::is_arg_defaulted(vm, arg_drop_hf))
{
MINFO("Dropping hard fork tables...");
core.get_blockchain_storage().get_db().drop_hard_fork_info();