diff options
author | MarcoFalke <falke.marco@gmail.com> | 2021-12-16 15:07:35 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-12-16 15:07:45 +0100 |
commit | 6b212cbbb9d7a564fc47c390e4bb20989ce26f5a (patch) | |
tree | 8696c5ef1c5cb125ecec1209da9ea7b64d185fe2 /test/functional/feature_filelock.py | |
parent | df6e961c417bc6e733f2fcefd2d712178a3da4b6 (diff) | |
parent | 261dddb92460f57d9a1e2409e7292da598787398 (diff) |
Merge bitcoin/bitcoin#23720: test: Refactor addr_relay.py addr generation, increase mocktime
261dddb92460f57d9a1e2409e7292da598787398 test: Combine addr generation helper functions (Martin Zumsande)
aeeccd9aa699a913680aa9f5a96eca285e1703e0 test: Fix intermittent issue in p2p_addr_relay.py (Martin Zumsande)
Pull request description:
Fixes #22449 by increasing the mocktime jump (just as in https://github.com/bitcoin/bitcoin/commit/6168eb06b2044f00f18727b955b672fc91c60bd7), which prevents failures due to rare Poisson timer events, or at least makes them a lot more unlikely.
The second commit combines the addr generation helper functions `setup_addr_msg` and `setup_rand_addr_msg`. It also changes the way `addr.time` is filled to random, because before, if too many addresses (>600) were created in a batch, they would stop being relayed because their timestamp would be too far in the future.
ACKs for top commit:
josibake:
reACK https://github.com/bitcoin/bitcoin/pull/23720/commits/261dddb92460f57d9a1e2409e7292da598787398
jnewbery:
utACK 261dddb92460f57d9a1e2409e7292da598787398
Tree-SHA512: d0eca887de4bc85092730284cf612193d2c12b0a3d624a2bfa5fef4a5890d3b6375c564333c5927425958e4b6ec86b8854b18b2233c7b6f1691d9ddc397948a9
Diffstat (limited to 'test/functional/feature_filelock.py')
0 files changed, 0 insertions, 0 deletions