remove dead rpc code

MarcoFalke · MarcoFalke · commit fa19bb2cd8c5 · 2020-09-24T19:53:24.000+02:00
Checking for fHelp, or the size of the args, is dead code because:
* fHelp is always false (src/qt/test/rpcnestedtests.cpp)
* It is already implicitly called by RPCHelpMan::Check
  (src/rpc/mining.cpp, src/rpc/misc.cpp, src/rpc/net.cpp)
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
@@ -16,9 +16,6 @@
 
 static UniValue rpcNestedTest_rpc(const JSONRPCRequest& request)
 {
-    if (request.fHelp) {
-        return "help message";
-    }
     return request.params.write(0, 0);
 }
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -242,12 +242,7 @@ static RPCHelpMan generatetodescriptor()
 static RPCHelpMan generate()
 {
     return RPCHelpMan{"generate", "has been replaced by the -generate cli option. Refer to -help for more information.", {}, {}, RPCExamples{""}, [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
-
-    if (request.fHelp) {
-        throw std::runtime_error(self.ToString());
-    } else {
         throw JSONRPCError(RPC_METHOD_NOT_FOUND, self.ToString());
-    }
     }};
 }
 
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -624,8 +624,6 @@ static RPCHelpMan echo(const std::string& name)
                 RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
-    if (request.fHelp) throw std::runtime_error(self.ToString());
-
     if (request.params[9].isStr()) {
         CHECK_NONFATAL(request.params[9].get_str() != "trigger_internal_bug");
     }
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -262,10 +262,10 @@ static RPCHelpMan addnode()
     std::string strCommand;
     if (!request.params[1].isNull())
         strCommand = request.params[1].get_str();
-    if (request.fHelp || request.params.size() != 2 ||
-        (strCommand != "onetry" && strCommand != "add" && strCommand != "remove"))
+    if (strCommand != "onetry" && strCommand != "add" && strCommand != "remove") {
         throw std::runtime_error(
             self.ToString());
+    }
 
     NodeContext& node = EnsureNodeContext(request.context);
     if(!node.connman)
@@ -604,7 +604,7 @@ static RPCHelpMan setban()
     std::string strCommand;
     if (!request.params[1].isNull())
         strCommand = request.params[1].get_str();
-    if (request.fHelp || !help.IsValidNumArgs(request.params.size()) || (strCommand != "add" && strCommand != "remove")) {
+    if (strCommand != "add" && strCommand != "remove") {
         throw std::runtime_error(help.ToString());
     }
     NodeContext& node = EnsureNodeContext(request.context);

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,6 @@`
`16`	`16`
`17`	`17`	`static UniValue rpcNestedTest_rpc(const JSONRPCRequest& request)`
`18`	`18`	`{`
`19`		`- if (request.fHelp) {`
`20`		`- return "help message";`
`21`		`- }`
`22`	`19`	`return request.params.write(0, 0);`
`23`	`20`	`}`
`24`	`21`
Original file line number	Diff line number	Diff line change
`@@ -242,12 +242,7 @@ static RPCHelpMan generatetodescriptor()`
`242`	`242`	`static RPCHelpMan generate()`
`243`	`243`	`{`
`244`	`244`	`return RPCHelpMan{"generate", "has been replaced by the -generate cli option. Refer to -help for more information.", {}, {}, RPCExamples{""}, [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {`
`245`		`-`
`246`		`- if (request.fHelp) {`
`247`		`- throw std::runtime_error(self.ToString());`
`248`		`- } else {`
`249`	`245`	`throw JSONRPCError(RPC_METHOD_NOT_FOUND, self.ToString());`
`250`		`- }`
`251`	`246`	`}};`
`252`	`247`	`}`
`253`	`248`
Original file line number	Diff line number	Diff line change
`@@ -624,8 +624,6 @@ static RPCHelpMan echo(const std::string& name)`
`624`	`624`	`RPCExamples{""},`
`625`	`625`	`[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue`
`626`	`626`	`{`
`627`		`- if (request.fHelp) throw std::runtime_error(self.ToString());`
`628`		`-`
`629`	`627`	`if (request.params[9].isStr()) {`
`630`	`628`	`CHECK_NONFATAL(request.params[9].get_str() != "trigger_internal_bug");`
`631`	`629`	`}`