RPC/Net: Use boolean consistently for networkactive, and remove from getinfo
This commit is contained in:
parent
b2b33d9017
commit
54cf99745f
3 changed files with 11 additions and 13 deletions
|
@ -89,10 +89,8 @@ UniValue getinfo(const UniValue& params, bool fHelp)
|
|||
#endif
|
||||
obj.push_back(Pair("blocks", (int)chainActive.Height()));
|
||||
obj.push_back(Pair("timeoffset", GetTimeOffset()));
|
||||
if (g_connman) {
|
||||
obj.push_back(Pair("networkactive", g_connman->GetNetworkActive()));
|
||||
if(g_connman)
|
||||
obj.push_back(Pair("connections", (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
|
||||
}
|
||||
obj.push_back(Pair("proxy", (proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string())));
|
||||
obj.push_back(Pair("difficulty", (double)GetDifficulty()));
|
||||
obj.push_back(Pair("testnet", Params().TestnetToBeDeprecatedFieldRPC()));
|
||||
|
|
|
@ -401,7 +401,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
|
|||
" \"localrelay\": true|false, (bool) true if transaction relay is requested from peers\n"
|
||||
" \"timeoffset\": xxxxx, (numeric) the time offset\n"
|
||||
" \"connections\": xxxxx, (numeric) the number of connections\n"
|
||||
" \"networkactive\": x, (numeric) the number of connections\n"
|
||||
" \"networkactive\": true|false, (bool) whether p2p networking is enabled\n"
|
||||
" \"networks\": [ (array) information per network\n"
|
||||
" {\n"
|
||||
" \"name\": \"xxx\", (string) network (ipv4, ipv6 or onion)\n"
|
||||
|
@ -437,7 +437,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
|
|||
obj.push_back(Pair("localrelay", fRelayTxes));
|
||||
obj.push_back(Pair("timeoffset", GetTimeOffset()));
|
||||
if (g_connman) {
|
||||
obj.push_back(Pair("networkactive", (int)g_connman->GetNetworkActive()));
|
||||
obj.push_back(Pair("networkactive", g_connman->GetNetworkActive()));
|
||||
obj.push_back(Pair("connections", (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
|
||||
}
|
||||
obj.push_back(Pair("networks", GetNetworksInfo()));
|
||||
|
@ -578,8 +578,8 @@ UniValue setnetworkactive(const JSONRPCRequest& request)
|
|||
{
|
||||
if (request.fHelp || request.params.size() != 1) {
|
||||
throw runtime_error(
|
||||
"setnetworkactive \"true|false\"\n"
|
||||
"Disable/Re-Enable all network activity temporarily."
|
||||
"setnetworkactive true|false\n"
|
||||
"Disable/enable all p2p network activity."
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -86,21 +86,21 @@ BOOST_AUTO_TEST_CASE(rpc_togglenetwork)
|
|||
UniValue r;
|
||||
|
||||
r = CallRPC("getnetworkinfo");
|
||||
int netState = find_value(r.get_obj(), "networkactive").get_int();
|
||||
BOOST_CHECK_EQUAL(netState, 1);
|
||||
bool netState = find_value(r.get_obj(), "networkactive").get_bool();
|
||||
BOOST_CHECK_EQUAL(netState, true);
|
||||
|
||||
BOOST_CHECK_NO_THROW(CallRPC("setnetworkactive false"));
|
||||
r = CallRPC("getnetworkinfo");
|
||||
int numConnection = find_value(r.get_obj(), "connections").get_int();
|
||||
BOOST_CHECK_EQUAL(numConnection, 0);
|
||||
|
||||
netState = find_value(r.get_obj(), "networkactive").get_int();
|
||||
BOOST_CHECK_EQUAL(netState, 0);
|
||||
netState = find_value(r.get_obj(), "networkactive").get_bool();
|
||||
BOOST_CHECK_EQUAL(netState, false);
|
||||
|
||||
BOOST_CHECK_NO_THROW(CallRPC("setnetworkactive true"));
|
||||
r = CallRPC("getnetworkinfo");
|
||||
netState = find_value(r.get_obj(), "networkactive").get_int();
|
||||
BOOST_CHECK_EQUAL(netState, 1);
|
||||
netState = find_value(r.get_obj(), "networkactive").get_bool();
|
||||
BOOST_CHECK_EQUAL(netState, true);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(rpc_rawsign)
|
||||
|
|
Loading…
Reference in a new issue