scripted-diff: test: Replace uses of (dis)?connect_nodes global
-BEGIN VERIFY SCRIPT- # max-depth=0 excludes test/functional/test_framework/... FILES=$(git grep -l --max-depth 0 "connect_nodes" test/functional) # Replace (dis)?connect_nodes(self.nodes[a], b) with self.(dis)?connect_nodes(a, b) sed -i 's/\b\(dis\)\?connect_nodes(self\.nodes\[\(.*\)\]/self.\1connect_nodes(\2/g' $FILES # Remove imports in the middle of a line sed -i 's/\(dis\)\?connect_nodes, //g' $FILES sed -i 's/, \(dis\)\?connect_nodes//g' $FILES # Remove imports on a line by themselves sed -i '/^\s*\(dis\)\?connect_nodes,\?$/d' $FILES sed -i '/^from test_framework\.util import connect_nodes$/d' $FILES -END VERIFY SCRIPT- Co-authored-by: Elliott Jin <elliott.jin@gmail.com>
This commit is contained in:
1 parent
be386840d4
commit
4b16c61461
38 files changed
+119
-165
No files matched your search
@@ -20,8 +20,6 @@ import shutil
|
||||
from test_framework.test_framework import BitcoinTestFramework
|
||||
from test_framework.util import (
|
||||
assert_equal,
|
||||
connect_nodes,
|
||||
disconnect_nodes,
|
||||
)
|
||||
|
||||
class ReorgsRestoreTest(BitcoinTestFramework):
|
||||
@@ -38,9 +36,9 @@ class ReorgsRestoreTest(BitcoinTestFramework):
|
||||
self.sync_blocks()
|
||||
|
||||
# Disconnect node1 from others to reorg its chain later
|
||||
disconnect_nodes(self.nodes[0], 1)
|
||||
disconnect_nodes(self.nodes[1], 2)
|
||||
connect_nodes(self.nodes[0], 2)
|
||||
self.disconnect_nodes(0, 1)
|
||||
self.disconnect_nodes(1, 2)
|
||||
self.connect_nodes(0, 2)
|
||||
|
||||
# Send a tx to be unconfirmed later
|
||||
txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), Decimal("10"))
|
||||
@@ -50,7 +48,7 @@ class ReorgsRestoreTest(BitcoinTestFramework):
|
||||
assert_equal(tx_before_reorg["confirmations"], 4)
|
||||
|
||||
# Disconnect node0 from node2 to broadcast a conflict on their respective chains
|
||||
disconnect_nodes(self.nodes[0], 2)
|
||||
self.disconnect_nodes(0, 2)
|
||||
nA = next(tx_out["vout"] for tx_out in self.nodes[0].gettransaction(txid_conflict_from)["details"] if tx_out["amount"] == Decimal("10"))
|
||||
inputs = []
|
||||
inputs.append({"txid": txid_conflict_from, "vout": nA})
|
||||
@@ -69,7 +67,7 @@ class ReorgsRestoreTest(BitcoinTestFramework):
|
||||
self.nodes[2].generate(9)
|
||||
|
||||
# Reconnect node0 and node2 and check that conflicted_txid is effectively conflicted
|
||||
connect_nodes(self.nodes[0], 2)
|
||||
self.connect_nodes(0, 2)
|
||||
self.sync_blocks([self.nodes[0], self.nodes[2]])
|
||||
conflicted = self.nodes[0].gettransaction(conflicted_txid)
|
||||
conflicting = self.nodes[0].gettransaction(conflicting_txid)
|
||||
|
||||
Reference in new issue
Block a user