mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 13:03:17 +01:00
d03d75fba8
fadfd844de8c53034a97dfa6f771ffe9f523fba2 test: Remove unused connect_nodes_bi (MarcoFalke) fa3b9ee8b2280af4bcbcfffff275aaf8dd125929 scripted-diff: test: Replace connect_nodes_bi with connect_nodes (MarcoFalke) faaee1e39a91b3f603881655d3980c29af09852b test: Use connect_nodes when connecting nodes in the test_framework (MarcoFalke) 1111bb91f517838e5b9f778bf6b5a9c8d561e857 test: Reformat python imports to aid scripted diff (MarcoFalke) Pull request description: By default all test nodes are connected in a chain. However, instead of just a single connection between each pair of nodes, we end up with up to four connections for a "middle" node (two outbound, two inbound, from each side). This is generally redundant (tx and block relay should succeed with just a single connection) and confusing. For example, test timeouts after a call to `sync_` may be racy and hard to reproduce. On top of that, the test `debug.log`s are hard to read because txs and block invs may be relayed on the same connection multiple times. Fix this by inlining `connect_nodes_bi` in the two tests that need it, and then replace it with a single `connect_nodes` in all other tests. Historic background: `connect_nodes_bi` has been introduced as a (temporary?) workaround for bug #5113 and #5138, which has long been fixed in #5157 and #5662. ACKs for top commit: laanwj: ACK fadfd844de8c53034a97dfa6f771ffe9f523fba2 jonasschnelli: utACK fadfd844de8c53034a97dfa6f771ffe9f523fba2 - more of less a cleanup PR. promag: Tested ACK fadfd844de8c53034a97dfa6f771ffe9f523fba2, ran extended tests. Tree-SHA512: 2d027a8fd150749c071b64438a0a78ec922178628a7dbb89fd1212b0fa34febd451798c940101155d3617c0426c2c4865174147709894f1f1bb6cfa336aa7e24
115 lines
5.2 KiB
Python
Executable File
115 lines
5.2 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2015 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 the preciousblock RPC."""
|
|
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
from test_framework.util import (
|
|
assert_equal,
|
|
connect_nodes,
|
|
sync_blocks,
|
|
)
|
|
|
|
def unidirectional_node_sync_via_rpc(node_src, node_dest):
|
|
blocks_to_copy = []
|
|
blockhash = node_src.getbestblockhash()
|
|
while True:
|
|
try:
|
|
assert len(node_dest.getblock(blockhash, False)) > 0
|
|
break
|
|
except:
|
|
blocks_to_copy.append(blockhash)
|
|
blockhash = node_src.getblockheader(blockhash, True)['previousblockhash']
|
|
blocks_to_copy.reverse()
|
|
for blockhash in blocks_to_copy:
|
|
blockdata = node_src.getblock(blockhash, False)
|
|
assert node_dest.submitblock(blockdata) in (None, 'inconclusive')
|
|
|
|
def node_sync_via_rpc(nodes):
|
|
for node_src in nodes:
|
|
for node_dest in nodes:
|
|
if node_src is node_dest:
|
|
continue
|
|
unidirectional_node_sync_via_rpc(node_src, node_dest)
|
|
|
|
class PreciousTest(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.setup_clean_chain = True
|
|
self.num_nodes = 3
|
|
|
|
def setup_network(self):
|
|
self.setup_nodes()
|
|
|
|
def run_test(self):
|
|
self.log.info("Ensure submitblock can in principle reorg to a competing chain")
|
|
gen_address = lambda i: self.nodes[i].get_deterministic_priv_key().address # A non-wallet address to mine to
|
|
self.nodes[0].generatetoaddress(1, gen_address(0))
|
|
assert_equal(self.nodes[0].getblockcount(), 1)
|
|
hashZ = self.nodes[1].generatetoaddress(2, gen_address(1))[-1]
|
|
assert_equal(self.nodes[1].getblockcount(), 2)
|
|
node_sync_via_rpc(self.nodes[0:3])
|
|
assert_equal(self.nodes[0].getbestblockhash(), hashZ)
|
|
|
|
self.log.info("Mine blocks A-B-C on Node 0")
|
|
hashC = self.nodes[0].generatetoaddress(3, gen_address(0))[-1]
|
|
assert_equal(self.nodes[0].getblockcount(), 5)
|
|
self.log.info("Mine competing blocks E-F-G on Node 1")
|
|
hashG = self.nodes[1].generatetoaddress(3, gen_address(1))[-1]
|
|
assert_equal(self.nodes[1].getblockcount(), 5)
|
|
assert hashC != hashG
|
|
self.log.info("Connect nodes and check no reorg occurs")
|
|
# Submit competing blocks via RPC so any reorg should occur before we proceed (no way to wait on inaction for p2p sync)
|
|
node_sync_via_rpc(self.nodes[0:2])
|
|
connect_nodes(self.nodes[0], 1)
|
|
assert_equal(self.nodes[0].getbestblockhash(), hashC)
|
|
assert_equal(self.nodes[1].getbestblockhash(), hashG)
|
|
self.log.info("Make Node0 prefer block G")
|
|
self.nodes[0].preciousblock(hashG)
|
|
assert_equal(self.nodes[0].getbestblockhash(), hashG)
|
|
self.log.info("Make Node0 prefer block C again")
|
|
self.nodes[0].preciousblock(hashC)
|
|
assert_equal(self.nodes[0].getbestblockhash(), hashC)
|
|
self.log.info("Make Node1 prefer block C")
|
|
self.nodes[1].preciousblock(hashC)
|
|
sync_blocks(self.nodes[0:2]) # wait because node 1 may not have downloaded hashC
|
|
assert_equal(self.nodes[1].getbestblockhash(), hashC)
|
|
self.log.info("Make Node1 prefer block G again")
|
|
self.nodes[1].preciousblock(hashG)
|
|
assert_equal(self.nodes[1].getbestblockhash(), hashG)
|
|
self.log.info("Make Node0 prefer block G again")
|
|
self.nodes[0].preciousblock(hashG)
|
|
assert_equal(self.nodes[0].getbestblockhash(), hashG)
|
|
self.log.info("Make Node1 prefer block C again")
|
|
self.nodes[1].preciousblock(hashC)
|
|
assert_equal(self.nodes[1].getbestblockhash(), hashC)
|
|
self.log.info("Mine another block (E-F-G-)H on Node 0 and reorg Node 1")
|
|
self.nodes[0].generatetoaddress(1, gen_address(0))
|
|
assert_equal(self.nodes[0].getblockcount(), 6)
|
|
self.sync_blocks(self.nodes[0:2])
|
|
hashH = self.nodes[0].getbestblockhash()
|
|
assert_equal(self.nodes[1].getbestblockhash(), hashH)
|
|
self.log.info("Node1 should not be able to prefer block C anymore")
|
|
self.nodes[1].preciousblock(hashC)
|
|
assert_equal(self.nodes[1].getbestblockhash(), hashH)
|
|
self.log.info("Mine competing blocks I-J-K-L on Node 2")
|
|
self.nodes[2].generatetoaddress(4, gen_address(2))
|
|
assert_equal(self.nodes[2].getblockcount(), 6)
|
|
hashL = self.nodes[2].getbestblockhash()
|
|
self.log.info("Connect nodes and check no reorg occurs")
|
|
node_sync_via_rpc(self.nodes[1:3])
|
|
connect_nodes(self.nodes[1], 2)
|
|
connect_nodes(self.nodes[0], 2)
|
|
assert_equal(self.nodes[0].getbestblockhash(), hashH)
|
|
assert_equal(self.nodes[1].getbestblockhash(), hashH)
|
|
assert_equal(self.nodes[2].getbestblockhash(), hashL)
|
|
self.log.info("Make Node1 prefer block L")
|
|
self.nodes[1].preciousblock(hashL)
|
|
assert_equal(self.nodes[1].getbestblockhash(), hashL)
|
|
self.log.info("Make Node2 prefer block H")
|
|
self.nodes[2].preciousblock(hashH)
|
|
assert_equal(self.nodes[2].getbestblockhash(), hashH)
|
|
|
|
if __name__ == '__main__':
|
|
PreciousTest().main()
|