Skip to content

Commit fa910e4

Browse files
author
MarcoFalke
committed
init: Remove deprecated args from hidden args
1 parent d262789 commit fa910e4

File tree

4 files changed

+3
-34
lines changed

4 files changed

+3
-34
lines changed

src/bitcoin-cli.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,6 @@ static int AppInitRPC(int argc, char* argv[])
139139
fprintf(stderr, "Error: %s\n", e.what());
140140
return EXIT_FAILURE;
141141
}
142-
if (gArgs.GetBoolArg("-rpcssl", false))
143-
{
144-
fprintf(stderr, "Error: SSL mode for RPC (-rpcssl) is no longer supported.\n");
145-
return EXIT_FAILURE;
146-
}
147142
return CONTINUE_EXECUTION;
148143
}
149144

src/httpserver.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,13 +352,6 @@ bool InitHTTPServer()
352352
if (!InitHTTPAllowList())
353353
return false;
354354

355-
if (gArgs.GetBoolArg("-rpcssl", false)) {
356-
uiInterface.ThreadSafeMessageBox(
357-
"SSL mode for RPC (-rpcssl) is no longer supported.",
358-
"", CClientUIInterface::MSG_ERROR);
359-
return false;
360-
}
361-
362355
// Redirect libevent's logging to our own log
363356
event_set_log_callback(&libevent_log_cb);
364357
// Update libevent's log handling. Returns false if our version of

src/init.cpp

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@ void SetupServerArgs()
322322
const auto regtestChainParams = CreateChainParams(CBaseChainParams::REGTEST);
323323

324324
// Hidden Options
325-
std::vector<std::string> hidden_args = {"-rpcssl", "-benchmark", "-h", "-help", "-socks", "-tor", "-debugnet", "-whitelistalwaysrelay",
326-
"-prematurewitness", "-walletprematurewitness", "-promiscuousmempoolflags", "-blockminsize", "-dbcrashratio", "-forcecompactdb", "-usehd",
325+
std::vector<std::string> hidden_args = {"-h", "-help",
326+
"-dbcrashratio", "-forcecompactdb", "-usehd",
327327
// GUI args. These will be overwritten by SetupUIArgs for the GUI
328328
"-allowselfsignedrootcertificates", "-choosedatadir", "-lang=<lang>", "-min", "-resetguisettings", "-rootcertificates=<file>", "-splash", "-uiplatform"};
329329

@@ -961,25 +961,6 @@ bool AppInitParameterInteraction()
961961
}
962962
}
963963

964-
// Check for -debugnet
965-
if (gArgs.GetBoolArg("-debugnet", false))
966-
InitWarning(_("Unsupported argument -debugnet ignored, use -debug=net."));
967-
// Check for -socks - as this is a privacy risk to continue, exit here
968-
if (gArgs.IsArgSet("-socks"))
969-
return InitError(_("Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported."));
970-
// Check for -tor - as this is a privacy risk to continue, exit here
971-
if (gArgs.GetBoolArg("-tor", false))
972-
return InitError(_("Unsupported argument -tor found, use -onion."));
973-
974-
if (gArgs.GetBoolArg("-benchmark", false))
975-
InitWarning(_("Unsupported argument -benchmark ignored, use -debug=bench."));
976-
977-
if (gArgs.GetBoolArg("-whitelistalwaysrelay", false))
978-
InitWarning(_("Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay."));
979-
980-
if (gArgs.IsArgSet("-blockminsize"))
981-
InitWarning("Unsupported argument -blockminsize ignored.");
982-
983964
// Checkmempool and checkblockindex default to true in regtest mode
984965
int ratio = std::min<int>(std::max<int>(gArgs.GetArg("-checkmempool", chainparams.DefaultConsistencyChecks() ? 1 : 0), 0), 1000000);
985966
if (ratio != 0) {

test/lint/check-doc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
CMD_GREP_ARGS = r"git grep --perl-regexp '{}' -- {} ':(exclude){}'".format(REGEX_ARG, CMD_ROOT_DIR, FOLDER_TEST)
2323
CMD_GREP_DOCS = r"git grep --perl-regexp '{}' {}".format(REGEX_DOC, CMD_ROOT_DIR)
2424
# list unsupported, deprecated and duplicate args as they need no documentation
25-
SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-promiscuousmempoolflags', '-blockminsize', '-dbcrashratio', '-forcecompactdb', '-usehd'])
25+
SET_DOC_OPTIONAL = set(['-h', '-help', '-dbcrashratio', '-forcecompactdb', '-usehd'])
2626

2727

2828
def main():

0 commit comments

Comments
 (0)