phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

test: cover TorV3 address in p2p_addrv2_relay

Browse source
This commit is contained in:
Matthew Zipkin 2023-06-23 11:02:04 -04:00
parent 80f64a3d40
commit 5aaf988ccc
No known key found for this signature in database
GPG key ID: E7E2984B6289C93A
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
test/functional/p2p_addrv2_relay.py
View file

@ -20,19 +20,24 @@ from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_equal from test_framework.util import assert_equal
I2P_ADDR = "c4gfnttsuwqomiygupdqqqyy5y5emnk5c73hrfvatri67prd7vyq.b32.i2p" I2P_ADDR = "c4gfnttsuwqomiygupdqqqyy5y5emnk5c73hrfvatri67prd7vyq.b32.i2p"
ONION_ADDR = "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion"
ADDRS = [] ADDRS = []
for i in range(10): for i in range(10):
addr = CAddress() addr = CAddress()
addr.time = int(time.time()) + i addr.time = int(time.time()) + i
addr.port = 8333 + i
addr.nServices = P2P_SERVICES addr.nServices = P2P_SERVICES
# Add one I2P address at an arbitrary position. # Add one I2P and one onion V3 address at an arbitrary position.
if i == 5: if i == 5:
addr.net = addr.NET_I2P addr.net = addr.NET_I2P
addr.ip = I2P_ADDR addr.ip = I2P_ADDR
addr.port = 0
elif i == 8:
addr.net = addr.NET_TORV3
addr.ip = ONION_ADDR
else: else:
addr.ip = f"123.123.123.{i % 256}" addr.ip = f"123.123.123.{i % 256}"
addr.port = 8333 + i
ADDRS.append(addr) ADDRS.append(addr)
@ -52,6 +57,17 @@ class AddrReceiver(P2PInterface):
self.wait_until(lambda: "addrv2" in self.last_message) self.wait_until(lambda: "addrv2" in self.last_message)
def calc_addrv2_msg_size(addrs):
size = 1 # vector length byte
for addr in addrs:
size += 4 # time
size += 1 # services, COMPACTSIZE(P2P_SERVICES)
size += 1 # network id
size += 1 # address length byte
size += addr.ADDRV2_ADDRESS_LENGTH[addr.net] # address
size += 2 # port
return size
class AddrTest(BitcoinTestFramework): class AddrTest(BitcoinTestFramework):
def set_test_params(self): def set_test_params(self):
self.setup_clean_chain = True self.setup_clean_chain = True
@ -71,9 +87,10 @@ class AddrTest(BitcoinTestFramework):
self.log.info('Check that addrv2 message content is relayed and added to addrman') self.log.info('Check that addrv2 message content is relayed and added to addrman')
addr_receiver = self.nodes[0].add_p2p_connection(AddrReceiver()) addr_receiver = self.nodes[0].add_p2p_connection(AddrReceiver())
msg.addrs = ADDRS msg.addrs = ADDRS
msg_size = calc_addrv2_msg_size(ADDRS)
with self.nodes[0].assert_debug_log([ with self.nodes[0].assert_debug_log([
'received: addrv2 (159 bytes) peer=0', f'received: addrv2 ({msg_size} bytes) peer=0',
'sending addrv2 (159 bytes) peer=1', f'sending addrv2 ({msg_size} bytes) peer=1',
]): ]):
addr_source.send_and_ping(msg) addr_source.send_and_ping(msg)
self.nodes[0].setmocktime(int(time.time()) + 30 * 60) self.nodes[0].setmocktime(int(time.time()) + 30 * 60)