diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py index 7c5bc99387cd..e113545ab449 100755 --- a/test/functional/p2p_addr_relay.py +++ b/test/functional/p2p_addr_relay.py @@ -16,22 +16,13 @@ from test_framework.util import ( assert_equal, ) -import time ADDRS = [] -for i in range(10): - addr = CAddress() - addr.time = int(time.time()) + i - addr.nServices = NODE_NETWORK - addr.ip = "123.123.123.{}".format(i % 256) - addr.port = 8333 + i - ADDRS.append(addr) - class AddrReceiver(P2PInterface): def on_addr(self, message): for addr in message.addrs: - assert_equal(addr.nServices, 9) + assert_equal(addr.nServices, 1) assert addr.ip.startswith('123.123.123.') assert (8333 <= addr.port < 8343) @@ -41,6 +32,14 @@ def set_test_params(self): self.num_nodes = 1 def run_test(self): + for i in range(10): + addr = CAddress() + addr.time = int(self.mocktime) + i + addr.nServices = NODE_NETWORK + addr.ip = "123.123.123.{}".format(i % 256) + addr.port = 8333 + i + ADDRS.append(addr) + self.log.info('Create connection that sends addr messages') addr_source = self.nodes[0].add_p2p_connection(P2PInterface()) msg = msg_addr() @@ -56,9 +55,10 @@ def run_test(self): with self.nodes[0].assert_debug_log([ 'Added 10 addresses from 127.0.0.1: 0 tried', 'received: addr (301 bytes) peer=0', + 'sending addr (301 bytes) peer=1', ]): addr_source.send_and_ping(msg) - self.nodes[0].setmocktime(int(time.time()) + 30 * 60) + self.bump_mocktime(30 * 60) addr_receiver.sync_with_ping()