Skip to content

Commit

Permalink
net: don't skip CJDNS from GetNetworkNames()
Browse files Browse the repository at this point in the history
  • Loading branch information
vasild committed Nov 3, 2021
1 parent c2d751a commit d96f8d3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/netbase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions test/functional/rpc_net.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def test_getpeerinfo(self):
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")
Expand Down Expand Up @@ -157,7 +157,7 @@ def test_getnetworkinfo(self):
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")
Expand Down

0 comments on commit d96f8d3

Please sign in to comment.