diff options
| author | Jon Atack <jon@atack.com> | 2021-05-26 16:34:39 +0200 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2021-06-03 13:36:40 +0200 |
| commit | 1d631e956fffbbc7891ed40be4fd39aeff036c52 (patch) | |
| tree | 67246b8f8b9170bfbe79f010bf1a1d2168d23a88 | |
| parent | 7d1769bc450a98c093a066d6daed84337040dbfb (diff) | |
| download | bitcoin-1d631e956fffbbc7891ed40be4fd39aeff036c52.tar.xz | |
p2p: remove BIP155Network::TORV2 from GetBIP155Network()
| -rw-r--r-- | src/netaddress.cpp | 9 | ||||
| -rw-r--r-- | src/netaddress.h | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/netaddress.cpp b/src/netaddress.cpp index 4b4094fc25..5d1f3e2652 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -32,14 +32,7 @@ CNetAddr::BIP155Network CNetAddr::GetBIP155Network() const case NET_IPV6: return BIP155Network::IPV6; case NET_ONION: - switch (m_addr.size()) { - case ADDR_TORV2_SIZE: - return BIP155Network::TORV2; - case ADDR_TORV3_SIZE: - return BIP155Network::TORV3; - default: - assert(false); - } + return BIP155Network::TORV3; case NET_I2P: return BIP155Network::I2P; case NET_CJDNS: diff --git a/src/netaddress.h b/src/netaddress.h index 63580c5744..fc709cf044 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -302,7 +302,7 @@ class CNetAddr /** * Get the BIP155 network id of this address. * Must not be called for IsInternal() objects. - * @returns BIP155 network id + * @returns BIP155 network id, except TORV2 which is no longer supported. */ BIP155Network GetBIP155Network() const; |