highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-08 06:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpc, refactor: clean-up addnode

Browse Source 
1. Use const where possible;
2. Rename variables to make them clearer;
3. There is no need to check whether `command` is null since it's a non-optional field.
This commit is contained in:
brunoerg 2022-10-21 15:03:40 -03:00
parent f08bde7f71
commit 56b27b8487
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/rpc/net.cpp
View File

@ -297,10 +297,8 @@ static RPCHelpMan addnode()
}, },
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{ {
std::string strCommand; const std::string command{request.params[1].get_str()};
if (!request.params[1].isNull()) if (command != "onetry" && command != "add" && command != "remove") {
strCommand = request.params[1].get_str();
if (strCommand != "onetry" && strCommand != "add" && strCommand != "remove") {
throw std::runtime_error( throw std::runtime_error(
self.ToString()); self.ToString());
} }
@ -308,24 +306,24 @@ static RPCHelpMan addnode()
NodeContext& node = EnsureAnyNodeContext(request.context); NodeContext& node = EnsureAnyNodeContext(request.context);
CConnman& connman = EnsureConnman(node); CConnman& connman = EnsureConnman(node);
std::string strNode = request.params[0].get_str(); const std::string node_arg{request.params[0].get_str()};
if (strCommand == "onetry") if (command == "onetry")
{ {
CAddress addr; CAddress addr;
connman.OpenNetworkConnection(addr, false, nullptr, strNode.c_str(), ConnectionType::MANUAL); connman.OpenNetworkConnection(addr, /*fCountFailure=*/false, /*grantOutbound=*/nullptr, node_arg.c_str(), ConnectionType::MANUAL);
return UniValue::VNULL; return UniValue::VNULL;
} }
if (strCommand == "add") if (command == "add")
{ {
if (!connman.AddNode(strNode)) { if (!connman.AddNode(node_arg)) {
throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: Node already added"); throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: Node already added");
} }
} }
else if(strCommand == "remove") else if (command == "remove")
{ {
if (!connman.RemoveAddedNode(strNode)) { if (!connman.RemoveAddedNode(node_arg)) {
throw JSONRPCError(RPC_CLIENT_NODE_NOT_ADDED, "Error: Node could not be removed. It has not been added previously."); throw JSONRPCError(RPC_CLIENT_NODE_NOT_ADDED, "Error: Node could not be removed. It has not been added previously.");
} }
} }