diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -201,11 +201,6 @@ fprintf(stderr, "Error: %s\n", e.what()); return EXIT_FAILURE; } - if (gArgs.GetBoolArg("-rpcssl", false)) { - fprintf(stderr, - "Error: SSL mode for RPC (-rpcssl) is no longer supported.\n"); - return EXIT_FAILURE; - } return CONTINUE_EXECUTION; } diff --git a/src/httpserver.cpp b/src/httpserver.cpp --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -382,13 +382,6 @@ return false; } - if (gArgs.GetBoolArg("-rpcssl", false)) { - uiInterface.ThreadSafeMessageBox( - "SSL mode for RPC (-rpcssl) is no longer supported.", "", - CClientUIInterface::MSG_ERROR); - return false; - } - // Redirect libevent's logging to our own log event_set_log_callback(&libevent_log_cb); // Update libevent's log handling. Returns false if our version of diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -378,10 +378,9 @@ // Hidden Options std::vector hidden_args = { - "-rpcssl", "-benchmark", "-h", "-help", "-socks", "-tor", "-debugnet", - "-whitelistalwaysrelay", "-blockminsize", "-dbcrashratio", - "-forcecompactdb", "-parkdeepreorg", "-automaticunparking", - "-replayprotectionactivationtime", "-enableminerfund", + "-h", "-help", "-dbcrashratio", "-forcecompactdb", "-parkdeepreorg", + "-automaticunparking", "-replayprotectionactivationtime", + "-enableminerfund", // GUI args. These will be overwritten by SetupUIArgs for the GUI "-allowselfsignedrootcertificates", "-choosedatadir", "-lang=", "-min", "-resetguisettings", "-rootcertificates=", "-splash", @@ -1660,36 +1659,6 @@ } } - // Check for -debugnet - if (gArgs.GetBoolArg("-debugnet", false)) { - InitWarning( - _("Unsupported argument -debugnet ignored, use -debug=net.")); - } - // Check for -socks - as this is a privacy risk to continue, exit here - if (gArgs.IsArgSet("-socks")) { - return InitError( - _("Unsupported argument -socks found. Setting SOCKS version isn't " - "possible anymore, only SOCKS5 proxies are supported.")); - } - // Check for -tor - as this is a privacy risk to continue, exit here - if (gArgs.GetBoolArg("-tor", false)) { - return InitError(_("Unsupported argument -tor found, use -onion.")); - } - - if (gArgs.GetBoolArg("-benchmark", false)) { - InitWarning( - _("Unsupported argument -benchmark ignored, use -debug=bench.")); - } - - if (gArgs.GetBoolArg("-whitelistalwaysrelay", false)) { - InitWarning(_("Unsupported argument -whitelistalwaysrelay ignored, use " - "-whitelistrelay and/or -whitelistforcerelay.")); - } - - if (gArgs.IsArgSet("-blockminsize")) { - InitWarning("Unsupported argument -blockminsize ignored."); - } - // Checkmempool and checkblockindex default to true in regtest mode int ratio = std::min( std::max( diff --git a/test/lint/check-doc.py b/test/lint/check-doc.py --- a/test/lint/check-doc.py +++ b/test/lint/check-doc.py @@ -31,10 +31,7 @@ '-zmqpubrawtx']) # list false positive undocumented arguments -SET_FALSE_POSITIVE_UNDOCUMENTED = set(['-benchmark', - '-blockminsize', - '-dbcrashratio', - '-debugnet', +SET_FALSE_POSITIVE_UNDOCUMENTED = set(['-dbcrashratio', '-enableminerfund', '-forcecompactdb', '-parkdeepreorg', @@ -42,10 +39,7 @@ # Remove after May 2020 upgrade '-phononactivationtime', '-replayprotectionactivationtime', - '-rpcssl', - '-socks', - '-tor', - '-whitelistalwaysrelay']) + ]) def main():