From b4ddb5ccd12045b9de780dacc713535d1f6509f8 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 13 Sep 2018 11:56:35 +0200 Subject: [PATCH] Merge #14207: doc: `-help-debug` implies `-help` d0b1cee1fe95eba7b968bed2c33ab681d169c91f doc: `-help-debug` implies `-help` (Wladimir J. van der Laan) Pull request description: I don't understand why `-help-debug` would be useful without requesting the help, and I've made this particular mistake one time too many. Tree-SHA512: 370eab368d672fc09e66fcc440db3cb7e4c70c2988aab506cdc3f3e234c27c8f0fc7512c9cf86606ac43f5c6023b3618b7b0302b4b6e289b388559ba8010f27a # Conflicts: # src/init.cpp --- src/init.cpp | 2 +- src/qt/paymentrequestplus.cpp | 1 - src/util/system.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 5afaa37eb254fb..f4572e726da5f5 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -642,7 +642,7 @@ void SetupServerArgs() gArgs.AddArg("-dip3params=:", "Override DIP3 activation and enforcement heights", false, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-dip8params=", "Override DIP8 activation height", false, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-disablegovernance", strprintf("Disable governance validation (0-1, default: %u)", 0), false, OptionsCategory::DEBUG_TEST); - gArgs.AddArg("-help-debug", "Show all debugging options (usage: --help -help-debug)", false, OptionsCategory::DEBUG_TEST); + gArgs.AddArg("-help-debug", "Print help message with debugging options and exit", false, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-highsubsidyblocks=", strprintf("The number of blocks with a higher than normal subsidy to mine at the start of a devnet (default: %u)", devnetConsensus.nHighSubsidyBlocks), false, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-highsubsidyfactor=", strprintf("The factor to multiply the normal block subsidy by while in the highsubsidyblocks window of a devnet (default: %u)", devnetConsensus.nHighSubsidyFactor), false, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-llmqchainlocks=", strprintf("Override the default LLMQ type used for ChainLocks on a devnet. Allows using ChainLocks with smaller LLMQs. (default: %s)", devnetConsensus.llmqs.at(devnetConsensus.llmqTypeChainLocks).name), false, OptionsCategory::DEBUG_TEST); diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp index 28b23f8b4e85aa..6276464b5eac70 100644 --- a/src/qt/paymentrequestplus.cpp +++ b/src/qt/paymentrequestplus.cpp @@ -143,7 +143,6 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c if (result != 1) { int error = X509_STORE_CTX_get_error(store_ctx); // For testing payment requests, we allow self signed root certs! - // This option is just shown in the UI options, if -help-debug is enabled. if (!(error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT && gArgs.GetBoolArg("-allowselfsignedrootcertificates", DEFAULT_SELFSIGNED_ROOTCERTS))) { throw SSLVerifyError(X509_verify_cert_error_string(error)); } else { diff --git a/src/util/system.cpp b/src/util/system.cpp index 575298c4c6755c..f7b21b3e861181 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -715,7 +715,7 @@ void ArgsManager::ForceRemoveArg(const std::string& strArg) bool HelpRequested(const ArgsManager& args) { - return args.IsArgSet("-?") || args.IsArgSet("-h") || args.IsArgSet("-help"); + return args.IsArgSet("-?") || args.IsArgSet("-h") || args.IsArgSet("-help") || args.IsArgSet("-help-debug"); } static const int screenWidth = 79;