aboutsummaryrefslogtreecommitdiff
path: root/test/functional/p2p_getdata.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/p2p_getdata.py')
-rwxr-xr-xtest/functional/p2p_getdata.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/test/functional/p2p_getdata.py b/test/functional/p2p_getdata.py
index fd94a09d80..89d68d5ba0 100755
--- a/test/functional/p2p_getdata.py
+++ b/test/functional/p2p_getdata.py
@@ -9,15 +9,11 @@ from test_framework.messages import (
CInv,
msg_getdata,
)
-from test_framework.mininode import (
- mininode_lock,
- P2PInterface,
-)
+from test_framework.p2p import P2PInterface
from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import wait_until
-class P2PStoreBlock(P2PInterface):
+class P2PStoreBlock(P2PInterface):
def __init__(self):
super().__init__()
self.blocks = defaultdict(int)
@@ -26,26 +22,28 @@ class P2PStoreBlock(P2PInterface):
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):
- self.nodes[0].add_p2p_connection(P2PStoreBlock())
+ 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.
- self.nodes[0].p2ps[0].send_and_ping(invalid_getdata)
+ 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))
- self.nodes[0].p2ps[0].send_and_ping(good_getdata)
- wait_until(lambda: self.nodes[0].p2ps[0].blocks[best_block] == 1, timeout=30, lock=mininode_lock)
+ p2p_block_store.send_and_ping(good_getdata)
+ p2p_block_store.wait_until(lambda: p2p_block_store.blocks[best_block] == 1)
+
if __name__ == '__main__':
GetdataTest().main()