Skip to content

Commit d96f8d3

Browse files
committed
net: don't skip CJDNS from GetNetworkNames()
1 parent c2d751a commit d96f8d3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/netbase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ std::vector<std::string> GetNetworkNames(bool append_unroutable)
123123
std::vector<std::string> names;
124124
for (int n = 0; n < NET_MAX; ++n) {
125125
const enum Network network{static_cast<Network>(n)};
126-
if (network == NET_UNROUTABLE || network == NET_CJDNS || network == NET_INTERNAL) continue;
126+
if (network == NET_UNROUTABLE || network == NET_INTERNAL) continue;
127127
names.emplace_back(GetNetworkName(network));
128128
}
129129
if (append_unroutable) {

test/functional/rpc_net.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def test_getpeerinfo(self):
106106
assert_equal(peer_info[1][1]['connection_type'], 'inbound')
107107

108108
# Check dynamically generated networks list in getpeerinfo help output.
109-
assert "(ipv4, ipv6, onion, i2p, not_publicly_routable)" in self.nodes[0].help("getpeerinfo")
109+
assert "(ipv4, ipv6, onion, i2p, cjdns, not_publicly_routable)" in self.nodes[0].help("getpeerinfo")
110110

111111
def test_getnettotals(self):
112112
self.log.info("Test getnettotals")
@@ -157,7 +157,7 @@ def test_getnetworkinfo(self):
157157
assert_net_servicesnames(int(info["localservices"], 0x10), info["localservicesnames"])
158158

159159
# Check dynamically generated networks list in getnetworkinfo help output.
160-
assert "(ipv4, ipv6, onion, i2p)" in self.nodes[0].help("getnetworkinfo")
160+
assert "(ipv4, ipv6, onion, i2p, cjdns)" in self.nodes[0].help("getnetworkinfo")
161161

162162
def test_getaddednodeinfo(self):
163163
self.log.info("Test getaddednodeinfo")

0 commit comments

Comments
 (0)