mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-07-09 09:51:08 +02:00
Merge bitcoin/bitcoin#29007: test: create deterministic addrman in the functional tests
2cc8ca19f4
[test] Use deterministic addrman in addrman info tests (stratospher)a897866109
[test] Restart a node with empty addrman (stratospher)71c19915c0
[test] Use deterministic addrman in addpeeraddress test (stratospher)7b868e6b67
Revert "test: avoid non-determinism in asmap-addrman test" (stratospher)69e091f3e1
[init] Create deterministic addrman in tests using -test=addrman (stratospher)be25ac3092
[init] Remove -addrmantest command line arg (stratospher)802e6e128b
[init] Add new command line arg for use only in functional tests (stratospher) Pull request description: An address is placed in a `[bucket,position]` in the addrman table (new table or tried table) using the `addpeeraddress` RPC. This `[bucket,position]` is calculated using `nKey`(and other metrics) for the addrman which is chosen randomly during every run. Supposing there are 2 addresses to be placed in an addrman table. During every test run, a different `[bucket,position]` would be calculated for each address.These calculated `[bucket,position]` could even be the same for the 2 addresses in some test runs and result in collisions in the addrman. We wouldn't be able to predict when the collisions are going to happen because we can't predict the `nKey` value which is chosen at random. This can cause flaky tests. Because of these non deterministic collisions, we are limited in what we can do to test addrman functionality. Currently in our tests don't add a second address to prevent these collisions from happening - we only keep 1 address in the new table and 1 address in the tried table. See https://github.com/bitcoin/bitcoin/pull/26988#discussion_r1091145647, https://github.com/bitcoin/bitcoin/pull/23084, [#22831(comment)](https://github.com/bitcoin/bitcoin/pull/22831/files#r708302639). This PR lets us create a deterministic addrman with fixed `nKey` so that we can know the `[bucket,position]` collisions beforehand, safely add more addresses in an addrman table and write more extensive tests. ACKs for top commit: amitiuttarwar: ACK2cc8ca19f4
achow101: ACK2cc8ca19f4
0xB10C: ACK2cc8ca19f4
mzumsande: Code Review ACK2cc8ca19f4
Tree-SHA512: 8acd9bdfe7de1eb44d22373bf13533d8ecf602df966fdd5b8b78afcd8cc35a286c95d2712f67a89473a0d68dded7d38f5599f6e4bf95a6589475444545bfb189
This commit is contained in:
@ -581,10 +581,16 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
|
||||
# Wait for nodes to stop
|
||||
node.wait_until_stopped()
|
||||
|
||||
def restart_node(self, i, extra_args=None):
|
||||
def restart_node(self, i, extra_args=None, clear_addrman=False):
|
||||
"""Stop and start a test node"""
|
||||
self.stop_node(i)
|
||||
self.start_node(i, extra_args)
|
||||
if clear_addrman:
|
||||
peers_dat = self.nodes[i].chain_path / "peers.dat"
|
||||
os.remove(peers_dat)
|
||||
with self.nodes[i].assert_debug_log(expected_msgs=[f'Creating peers.dat because the file was not found ("{peers_dat}")']):
|
||||
self.start_node(i, extra_args)
|
||||
else:
|
||||
self.start_node(i, extra_args)
|
||||
|
||||
def wait_for_node_exit(self, i, timeout):
|
||||
self.nodes[i].process.wait(timeout)
|
||||
|
Reference in New Issue
Block a user