diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-12-15 13:07:07 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-12-15 13:07:34 +0100 |
| commit | 60b5795133a2f6bed5d68340c5f5b6c225fa9cdb (patch) | |
| tree | b42b59a28c4fb49b0286163d3561498e96bf89eb /test | |
| parent | 2d0bdb2089644f5904629413423cdc897911b081 (diff) | |
| parent | fad943821e35d0eb2143061e718f0193e12a4c71 (diff) | |
Merge bitcoin/bitcoin#23758: net: Use type-safe mockable time for peer connection time
fad943821e35d0eb2143061e718f0193e12a4c71 scripted-diff: Rename touched member variables (MarcoFalke)
fa663a4c0d20487ed3f7a93e1c2ca9932b05f5a8 Use mockable time for peer connection time (MarcoFalke)
fad7ead146a152f46b25ce6623e05cbb1dbc8cca refactor: Use type-safe std::chrono in net (MarcoFalke)
Pull request description:
Benefits:
* Type-safe
* Mockable
* Allows to revert a temporary test workaround
ACKs for top commit:
naumenkogs:
ACK fad943821e35d0eb2143061e718f0193e12a4c71
shaavan:
ACK fad943821e35d0eb2143061e718f0193e12a4c71
Tree-SHA512: af9bdfc695ab727b100c6810a7289d29b02b0ea9fa4fee9cc1f3eeefb52c8c465ea2734bae0c1c63b3b0d6264ba2c493268bc970ef6916570eb166de77829d82
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/p2p_timeouts.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/p2p_timeouts.py b/test/functional/p2p_timeouts.py index 602f826782..cf714bc888 100755 --- a/test/functional/p2p_timeouts.py +++ b/test/functional/p2p_timeouts.py @@ -86,7 +86,7 @@ class TimeoutsTest(BitcoinTestFramework): ] with self.nodes[0].assert_debug_log(expected_msgs=expected_timeout_logs): - self.mock_forward(5) + self.mock_forward(2) no_verack_node.wait_for_disconnect(timeout=1) no_version_node.wait_for_disconnect(timeout=1) no_send_node.wait_for_disconnect(timeout=1) |