From 4f8704d57f8fb2958a43534779b20201b77eecae Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Sat, 28 Apr 2018 19:40:51 -0400 Subject: Give an error and exit if there are unknown parameters If an unknown option is given via either the command line args or the conf file, throw an error and exit Update tests for ArgsManager knowing args Ignore unknown options in the config file for bitcoin-cli Fix tests and bitcoin-cli to match actual options used --- src/init.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 882371946..b4e2eec0d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -499,6 +499,23 @@ void SetupServerArgs() gArgs.AddArg("-rpcuser=", "Username for JSON-RPC connections", false, OptionsCategory::RPC); gArgs.AddArg("-rpcworkqueue=", strprintf("Set the depth of the work queue to service RPC calls (default: %d)", DEFAULT_HTTP_WORKQUEUE), true, OptionsCategory::RPC); gArgs.AddArg("-server", "Accept command line and JSON-RPC commands", false, OptionsCategory::RPC); + + // Hidden options + gArgs.AddArg("-rpcssl", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-benchmark", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-h", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-help", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-socks", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-tor", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-debugnet", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-whitelistalwaysrelay", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-prematurewitness", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-walletprematurewitness", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-promiscuousmempoolflags", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-blockminsize", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-dbcrashratio", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-forcecompactdb", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-usehd", "", false, OptionsCategory::HIDDEN); } std::string LicenseInfo() -- cgit v1.2.3