diff options
author | Jon Atack <jon@atack.com> | 2021-07-25 12:55:01 +0200 |
---|---|---|
committer | Jon Atack <jon@atack.com> | 2021-07-25 12:55:48 +0200 |
commit | 75ea9ecf11bfeb120c58dc6c62539021a94ef97c (patch) | |
tree | d7f047e637c72065c15b100589b7a99c8f10a1a8 | |
parent | 2aa937e97af66206f9f128e59b47ec93cfb5e0b3 (diff) | |
download | bitcoin-75ea9ecf11bfeb120c58dc6c62539021a94ef97c.tar.xz |
cli -addrinfo: drop torv2, torv3 becomes onion per GetNetworkName()
-rw-r--r-- | src/bitcoin-cli.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 1ec6411e32..f72804d29c 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -245,7 +245,7 @@ public: class AddrinfoRequestHandler : public BaseRequestHandler { private: - static constexpr std::array m_networks{"ipv4", "ipv6", "torv2", "torv3", "i2p"}; + static constexpr std::array m_networks{"ipv4", "ipv6", "onion", "i2p"}; int8_t NetworkStringToId(const std::string& str) const { for (size_t i = 0; i < m_networks.size(); ++i) { @@ -271,13 +271,10 @@ public: if (!nodes.empty() && nodes.at(0)["network"].isNull()) { throw std::runtime_error("-addrinfo requires bitcoind server to be running v22.0 and up"); } - // Count the number of peers we know by network, including torv2 versus torv3. + // Count the number of peers known to our node, by network. std::array<uint64_t, m_networks.size()> counts{{}}; for (const UniValue& node : nodes) { std::string network_name{node["network"].get_str()}; - if (network_name == "onion") { - network_name = node["address"].get_str().size() > 22 ? "torv3" : "torv2"; - } const int8_t network_id{NetworkStringToId(network_name)}; if (network_id == UNKNOWN_NETWORK) continue; ++counts.at(network_id); |