diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2021-02-15 16:55:24 +0100 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2021-03-01 18:19:47 +0100 |
| commit | a701fcf01f3ea9a12e869bfa52321302cf68351c (patch) | |
| tree | 59e0dd70f416f5b7e7d64082cea55aab2f7dd711 | |
| parent | 0181e244394bd9e68e9f0d44704e7b0fd12a6b1f (diff) | |
| download | bitcoin-a701fcf01f3ea9a12e869bfa52321302cf68351c.tar.xz | |
net: Do not skip the I2P network from GetNetworkNames()
So that help texts include "i2p" in:
* `./bitcoind -help` (in `-onlynet` description)
* `getpeerinfo` RPC
* `getnetworkinfo` RPC
Co-authored-by: Jon Atack <jon@atack.com>
| -rw-r--r-- | src/netbase.cpp | 2 | ||||
| -rwxr-xr-x | test/functional/rpc_net.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index b09b21c2a1..7dc616080d 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -78,7 +78,7 @@ std::vector<std::string> GetNetworkNames(bool append_unroutable) std::vector<std::string> names; for (int n = 0; n < NET_MAX; ++n) { const enum Network network{static_cast<Network>(n)}; - if (network == NET_UNROUTABLE || network == NET_I2P || network == NET_CJDNS || network == NET_INTERNAL) continue; + if (network == NET_UNROUTABLE || network == NET_CJDNS || network == NET_INTERNAL) continue; names.emplace_back(GetNetworkName(network)); } if (append_unroutable) { diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py index 2d41963beb..9adb32c3c5 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -105,7 +105,7 @@ class NetTest(BitcoinTestFramework): 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") + assert "(ipv4, ipv6, onion, i2p, not_publicly_routable)" in self.nodes[0].help("getpeerinfo") def test_getnettotals(self): self.log.info("Test getnettotals") @@ -156,7 +156,7 @@ class NetTest(BitcoinTestFramework): 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") + assert "(ipv4, ipv6, onion, i2p)" in self.nodes[0].help("getnetworkinfo") def test_getaddednodeinfo(self): self.log.info("Test getaddednodeinfo") |