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:
@@ -20,8 +20,8 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
|
||||
wallet = MiniWallet(node)
|
||||
|
||||
# Add enough mature utxos to the wallet so that all txs spend confirmed coins
|
||||
wallet.generate(3)
|
||||
node.generate(COINBASE_MATURITY)
|
||||
self.generate(wallet, 3)
|
||||
self.generate(node, COINBASE_MATURITY)
|
||||
|
||||
# Spend block 1/2/3's coinbase transactions
|
||||
# Mine a block
|
||||
@@ -34,9 +34,9 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
|
||||
# ... make sure all the transactions are confirmed again
|
||||
blocks = []
|
||||
spends1_ids = [wallet.send_self_transfer(from_node=node)['txid'] for _ in range(3)]
|
||||
blocks.extend(node.generate(1))
|
||||
blocks.extend(self.generate(node, 1))
|
||||
spends2_ids = [wallet.send_self_transfer(from_node=node)['txid'] for _ in range(3)]
|
||||
blocks.extend(node.generate(1))
|
||||
blocks.extend(self.generate(node, 1))
|
||||
|
||||
spends_ids = set(spends1_ids + spends2_ids)
|
||||
|
||||
@@ -53,7 +53,7 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
|
||||
assert_equal(set(node.getrawmempool()), spends_ids)
|
||||
|
||||
# Generate another block, they should all get mined
|
||||
blocks = node.generate(1)
|
||||
blocks = self.generate(node, 1)
|
||||
# mempool should be empty, all txns confirmed
|
||||
assert_equal(set(node.getrawmempool()), set())
|
||||
confirmed_txns = set(node.getblock(blocks[0])['tx'])
|
||||
|
||||
Reference in New Issue
Block a user