This adds methods to the test framework that can be called by just self.sync_*().
This avoids having to import the underlying util method. Also, in the default case, where all nodes are synced this avoid having to pass self.nodes explicitly.
So the effective changes are:
0@@
1-from test_framework.util import sync_blocks, sync_mempools
2@@
3- sync_blocks(self.nodes)
4+ self.sync_blocks()
5@@
6- sync_mempools(self.nodes)
7+ self.sync_mempools()
-BEGIN VERIFY SCRIPT-
FILE_LIST=$(git grep -l 'def sync_blocks' ./test/functional/*.py)
sed -i -e 's/def sync_blocks/def send_blocks/g' $FILE_LIST
sed -i -e 's/self.sync_blocks/self.send_blocks/g' $FILE_LIST
-END VERIFY SCRIPT-
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
Concept ACK.
Could move sync_block implementation to TestFramework?
Could move sync_block implementation to TestFramework?
Good point, but to keep the diff complete but still minimal, I’d like to do this in a later pull request. (I have some changes that build on top of this)
116@@ -117,7 +117,7 @@ def setup_network(self):
117 # sync_all() should not include node2, since we're not expecting it to
118 # sync.
119 connect_nodes(self.nodes[0], 1)
120- self.sync_all([self.nodes[0:2]])
121+ self.sync_all(self.nodes[0:2])
commit fade397d70cd23d504d335bf8c21cb3ed6c2cbd4
I’d commit these [] drops separately.
59@@ -60,7 +60,7 @@ def run_test(self):
60
61 self.log.info("Running tests")
62 dest_address = peer_node.getnewaddress()
63- test_simple_bumpfee_succeeds(rbf_node, peer_node, dest_address)
commit fae14a07b6a31211ea3bd0c707754b4b743d03d2
Could mention in the commit message that this is required for the upcoming scripted diff.
Tests can be run on all commits via
0git rebase --interactive --exec "./test/functional/test_runner.py -j 9" HEAD~6
Needed for a future scripted diff
-BEGIN VERIFY SCRIPT-
sed -i -e 's/sync_blocks(self.nodes)/self.sync_blocks()/g' $(git grep -l 'sync_blocks(self.nodes)' ./test/functional/*.py)
sed -i -e 's/sync_mempools(self.nodes)/self.sync_mempools()/g' $(git grep -l 'sync_mempools(self.nodes)' ./test/functional/*.py)
sed -i -e 's/ sync_blocks(/ self.sync_blocks(/g' $(git grep -l sync_blocks ./test/functional/*.py)
sed -i -e 's/ sync_mempools(/ self.sync_mempools(/g' $(git grep -l sync_mempools ./test/functional/*.py)
-END VERIFY SCRIPT-
10@@ -11,7 +11,13 @@
11 from test_framework.messages import CInv, msg_getdata, msg_verack, NODE_BLOOM, NODE_NETWORK_LIMITED, NODE_WITNESS
12 from test_framework.mininode import P2PInterface, mininode_lock
13 from test_framework.test_framework import BitcoinTestFramework
14-from test_framework.util import assert_equal, disconnect_nodes, connect_nodes_bi, sync_blocks, wait_until
15+from test_framework.util import (
16+ assert_equal,
17+ disconnect_nodes,
connect_nodes_bi before disconnect_nodes.
19@@ -20,7 +20,12 @@
20 """
21
22 from test_framework.test_framework import BitcoinTestFramework
23-from test_framework.util import (assert_raises_rpc_error, connect_nodes, sync_blocks, assert_equal, set_node_times)
24+from test_framework.util import (
25+ assert_raises_rpc_error,