mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 13:03:17 +01:00
08a7d1118f
fa80b4788bbe3ef00c5d767c0d89ba9809d8707c test: Remove global wait_until from p2p_getdata (MarcoFalke)
999922baed3a80b581ce46daa01c4cbca4fcbfd8 test: Default mininode.wait_until timeout to 60s (MarcoFalke)
fab47375fe0bdec1e557e087fdb0707c4dfa7cc2 test: pep-8 p2p_getdata.py (MarcoFalke)
Pull request description:
Using the global wait_until makes it impossible to adjust the timeout based on the hardware the test is running on.
Fix that by using the mininode member function.
So for example, `./test/functional/p2p_getdata.py --timeout-factor=0.04` gives a timeout of 2.4 seconds.
ACKs for top commit:
laanwj:
ACK fa80b4788bbe3ef00c5d767c0d89ba9809d8707c
Tree-SHA512: ebb1b7860a64451de2b8ee9a0966faddb13b84af711f6744e8260d7c9bc0b382e8fb259897df5212190821e850ed30d4d5c2d7af45a97f207fd4511b06b6674a
50 lines
1.6 KiB
Python
Executable File
50 lines
1.6 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2020 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
"""Test GETDATA processing behavior"""
|
|
from collections import defaultdict
|
|
|
|
from test_framework.messages import (
|
|
CInv,
|
|
msg_getdata,
|
|
)
|
|
from test_framework.mininode import P2PInterface
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
|
|
|
|
class P2PStoreBlock(P2PInterface):
|
|
def __init__(self):
|
|
super().__init__()
|
|
self.blocks = defaultdict(int)
|
|
|
|
def on_block(self, message):
|
|
message.block.calc_sha256()
|
|
self.blocks[message.block.sha256] += 1
|
|
|
|
|
|
class GetdataTest(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.num_nodes = 1
|
|
|
|
def run_test(self):
|
|
p2p_block_store = self.nodes[0].add_p2p_connection(P2PStoreBlock())
|
|
|
|
self.log.info("test that an invalid GETDATA doesn't prevent processing of future messages")
|
|
|
|
# Send invalid message and verify that node responds to later ping
|
|
invalid_getdata = msg_getdata()
|
|
invalid_getdata.inv.append(CInv(t=0, h=0)) # INV type 0 is invalid.
|
|
p2p_block_store.send_and_ping(invalid_getdata)
|
|
|
|
# Check getdata still works by fetching tip block
|
|
best_block = int(self.nodes[0].getbestblockhash(), 16)
|
|
good_getdata = msg_getdata()
|
|
good_getdata.inv.append(CInv(t=2, h=best_block))
|
|
p2p_block_store.send_and_ping(good_getdata)
|
|
p2p_block_store.wait_until(lambda: self.nodes[0].p2ps[0].blocks[best_block] == 1)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
GetdataTest().main()
|