aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2021-06-17 14:01:57 +0200
committerMarcoFalke <falke.marco@gmail.com>2021-06-18 20:09:23 +0200
commitfa751a47ff4253f58518d7f43d33ec1227ea0dbc (patch)
tree06ed349c6e1dac6e87c3f9e9f879cc4603edd106
parentfa3c1eee7ff2646e78540d53b4f8eaf095a8c27d (diff)
downloadbitcoin-fa751a47ff4253f58518d7f43d33ec1227ea0dbc.tar.xz
Remove unused OptionsCategory arg from AddCommand
-rw-r--r--src/bitcoin-util.cpp2
-rw-r--r--src/bitcoin-wallet.cpp10
-rw-r--r--src/util/system.cpp4
-rw-r--r--src/util/system.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/bitcoin-util.cpp b/src/bitcoin-util.cpp
index 8f50126f41..55c3580e15 100644
--- a/src/bitcoin-util.cpp
+++ b/src/bitcoin-util.cpp
@@ -34,7 +34,7 @@ static void SetupBitcoinUtilArgs(ArgsManager &argsman)
argsman.AddArg("-version", "Print version and exit", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
- argsman.AddCommand("grind", "Perform proof of work on hex header string", OptionsCategory::COMMANDS);
+ argsman.AddCommand("grind", "Perform proof of work on hex header string");
SetupChainParamsBaseOptions(argsman);
}
diff --git a/src/bitcoin-wallet.cpp b/src/bitcoin-wallet.cpp
index b84d909b07..765954c92e 100644
--- a/src/bitcoin-wallet.cpp
+++ b/src/bitcoin-wallet.cpp
@@ -33,11 +33,11 @@ static void SetupWalletToolArgs(ArgsManager& argsman)
argsman.AddArg("-format=<format>", "The format of the wallet file to create. Either \"bdb\" or \"sqlite\". Only used with 'createfromdump'", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
argsman.AddArg("-printtoconsole", "Send trace/debug info to console (default: 1 when no -debug is true, 0 otherwise).", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
- argsman.AddCommand("info", "Get wallet info", OptionsCategory::COMMANDS);
- argsman.AddCommand("create", "Create new wallet file", OptionsCategory::COMMANDS);
- argsman.AddCommand("salvage", "Attempt to recover private keys from a corrupt wallet. Warning: 'salvage' is experimental.", OptionsCategory::COMMANDS);
- argsman.AddCommand("dump", "Print out all of the wallet key-value records", OptionsCategory::COMMANDS);
- argsman.AddCommand("createfromdump", "Create new wallet file from dumped records", OptionsCategory::COMMANDS);
+ argsman.AddCommand("info", "Get wallet info");
+ argsman.AddCommand("create", "Create new wallet file");
+ argsman.AddCommand("salvage", "Attempt to recover private keys from a corrupt wallet. Warning: 'salvage' is experimental.");
+ argsman.AddCommand("dump", "Print out all of the wallet key-value records");
+ argsman.AddCommand("createfromdump", "Create new wallet file from dumped records");
}
static bool WalletAppInit(ArgsManager& args, int argc, char* argv[])
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 5ea0139275..ee7a76be29 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -620,14 +620,14 @@ void ArgsManager::ForceSetArg(const std::string& strArg, const std::string& strV
m_settings.forced_settings[SettingName(strArg)] = strValue;
}
-void ArgsManager::AddCommand(const std::string& cmd, const std::string& help, const OptionsCategory& cat)
+void ArgsManager::AddCommand(const std::string& cmd, const std::string& help)
{
Assert(cmd.find('=') == std::string::npos);
Assert(cmd.at(0) != '-');
LOCK(cs_args);
m_accept_any_command = false; // latch to false
- std::map<std::string, Arg>& arg_map = m_available_args[cat];
+ std::map<std::string, Arg>& arg_map = m_available_args[OptionsCategory::COMMANDS];
auto ret = arg_map.emplace(cmd, Arg{"", help, ArgsManager::COMMAND});
Assert(ret.second); // Fail on duplicate commands
}
diff --git a/src/util/system.h b/src/util/system.h
index ea9870a343..3547bad585 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -374,7 +374,7 @@ public:
/**
* Add subcommand
*/
- void AddCommand(const std::string& cmd, const std::string& help, const OptionsCategory& cat);
+ void AddCommand(const std::string& cmd, const std::string& help);
/**
* Add many hidden arguments