diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2021-09-09 15:55:45 +0200 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2021-11-03 14:58:53 +0100 |
| commit | d96f8d304c872b21070245c1b6aacc8b1f5da697 (patch) | |
| tree | 6150b9301eb21b426d2ff377149fe1f2982d0be5 | |
| parent | c2d751abbae3811adaf856b1dd1b71b33e54d315 (diff) | |
| download | bitcoin-d96f8d304c872b21070245c1b6aacc8b1f5da697.tar.xz | |
net: don't skip CJDNS from GetNetworkNames()
| -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 56f124579a..6191f25cd9 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -123,7 +123,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_CJDNS || network == NET_INTERNAL) continue; + if (network == NET_UNROUTABLE || 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 103c064cf0..0857f4e0ca 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -106,7 +106,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, i2p, not_publicly_routable)" in self.nodes[0].help("getpeerinfo") + assert "(ipv4, ipv6, onion, i2p, cjdns, not_publicly_routable)" in self.nodes[0].help("getpeerinfo") def test_getnettotals(self): self.log.info("Test getnettotals") @@ -157,7 +157,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, i2p)" in self.nodes[0].help("getnetworkinfo") + assert "(ipv4, ipv6, onion, i2p, cjdns)" in self.nodes[0].help("getnetworkinfo") def test_getaddednodeinfo(self): self.log.info("Test getaddednodeinfo") |