diff options
| author | Jon Atack <jon@atack.com> | 2021-02-01 23:56:20 +0100 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2021-02-02 00:16:04 +0100 |
| commit | 0dbde700a6e9894a8ead20f2eebd0ff6554ef2d9 (patch) | |
| tree | a3b1dcd90449da31658189b8f3d1ffc56ab176f4 | |
| parent | 1c3af37881adbbc37fb9924bcf69c403fcae1ae7 (diff) | |
| download | bitcoin-0dbde700a6e9894a8ead20f2eebd0ff6554ef2d9.tar.xz | |
rpc: use GetNetworkNames() in getnetworkinfo and getpeerinfo helps
| -rw-r--r-- | src/rpc/net.cpp | 4 | ||||
| -rwxr-xr-x | test/functional/rpc_net.py | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 47d77b341a..e83f66dd12 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -104,7 +104,7 @@ static RPCHelpMan getpeerinfo() {RPCResult::Type::STR, "addr", "(host:port) The IP address and port of the peer"}, {RPCResult::Type::STR, "addrbind", "(ip:port) Bind address of the connection to the peer"}, {RPCResult::Type::STR, "addrlocal", "(ip:port) Local address as reported by the peer"}, - {RPCResult::Type::STR, "network", "Network (ipv4, ipv6, or onion) the peer connected through"}, + {RPCResult::Type::STR, "network", "Network (" + Join(GetNetworkNames(/* append_unroutable */ true), ", ") + ")"}, {RPCResult::Type::NUM, "mapped_as", "The AS in the BGP route to the peer used for diversifying\n" "peer selection (only available if the asmap config flag is set)"}, {RPCResult::Type::STR_HEX, "services", "The services offered"}, @@ -587,7 +587,7 @@ static RPCHelpMan getnetworkinfo() { {RPCResult::Type::OBJ, "", "", { - {RPCResult::Type::STR, "name", "network (ipv4, ipv6 or onion)"}, + {RPCResult::Type::STR, "name", "network (" + Join(GetNetworkNames(), ", ") + ")"}, {RPCResult::Type::BOOL, "limited", "is the network limited using -onlynet?"}, {RPCResult::Type::BOOL, "reachable", "is the network reachable?"}, {RPCResult::Type::STR, "proxy", "(\"host:port\") the proxy that is used for this network, or empty if none"}, diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py index de0b7f303f..f1cb7c82bd 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -101,6 +101,9 @@ class NetTest(BitcoinTestFramework): assert_equal(peer_info[1][0]['connection_type'], 'manual') assert_equal(peer_info[1][1]['connection_type'], 'inbound') + # Check dynamically generated networks list in getpeerinfo help output. + assert "(ipv4, ipv6, onion, not_publicly_routable)" in self.nodes[0].help("getpeerinfo") + def test_getnettotals(self): self.log.info("Test getnettotals") # Test getnettotals and getpeerinfo by doing a ping. The bytes @@ -149,6 +152,9 @@ class NetTest(BitcoinTestFramework): for info in network_info: assert_net_servicesnames(int(info["localservices"], 0x10), info["localservicesnames"]) + # Check dynamically generated networks list in getnetworkinfo help output. + assert "(ipv4, ipv6, onion)" in self.nodes[0].help("getnetworkinfo") + def test_getaddednodeinfo(self): self.log.info("Test getaddednodeinfo") assert_equal(self.nodes[0].getaddednodeinfo(), []) |