mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-12-04 17:52:25 +01:00
scripted-diff: Use generate* from TestFramework
-BEGIN VERIFY SCRIPT-
sed --regexp-extended -i \
's/((self\.)?(nodes\[[^]]+\]|[a-z_]*(wallet|node)[0-9a-z_]*))\.(generate(|toaddress|block|todescriptor)(\(|, ))/self.\5\1, /g' \
$(git grep -l generate ./test | grep -v 'test_framework/' | grep -v 'feature_rbf')
-END VERIFY SCRIPT-
This commit is contained in:
@@ -84,7 +84,7 @@ class TxnMallTest(BitcoinTestFramework):
|
||||
|
||||
# Have node0 mine a block, if requested:
|
||||
if (self.options.mine_block):
|
||||
self.nodes[0].generate(1)
|
||||
self.generate(self.nodes[0], 1)
|
||||
self.sync_blocks(self.nodes[0:2])
|
||||
|
||||
tx1 = self.nodes[0].gettransaction(txid1)
|
||||
@@ -114,13 +114,13 @@ class TxnMallTest(BitcoinTestFramework):
|
||||
return
|
||||
|
||||
# ... mine a block...
|
||||
self.nodes[2].generate(1)
|
||||
self.generate(self.nodes[2], 1)
|
||||
|
||||
# Reconnect the split network, and sync chain:
|
||||
self.connect_nodes(1, 2)
|
||||
self.nodes[2].sendrawtransaction(node0_tx2["hex"])
|
||||
self.nodes[2].sendrawtransaction(tx2["hex"])
|
||||
self.nodes[2].generate(1) # Mine another block to make sure we sync
|
||||
self.generate(self.nodes[2], 1) # Mine another block to make sure we sync
|
||||
self.sync_blocks()
|
||||
|
||||
# Re-fetch transaction info:
|
||||
|
||||
Reference in New Issue
Block a user