mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-08-23 13:42:23 +02: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:
@@ -45,7 +45,7 @@ class RpcCreateMultiSigTest(BitcoinTestFramework):
|
||||
self.check_addmultisigaddress_errors()
|
||||
|
||||
self.log.info('Generating blocks ...')
|
||||
node0.generate(149)
|
||||
self.generate(node0, 149)
|
||||
self.sync_all()
|
||||
|
||||
self.moved = 0
|
||||
@@ -116,7 +116,7 @@ class RpcCreateMultiSigTest(BitcoinTestFramework):
|
||||
|
||||
def checkbalances(self):
|
||||
node0, node1, node2 = self.nodes
|
||||
node0.generate(COINBASE_MATURITY)
|
||||
self.generate(node0, COINBASE_MATURITY)
|
||||
self.sync_all()
|
||||
|
||||
bal0 = node0.getbalance()
|
||||
@@ -179,7 +179,7 @@ class RpcCreateMultiSigTest(BitcoinTestFramework):
|
||||
value = tx["vout"][vout]["value"]
|
||||
prevtxs = [{"txid": txid, "vout": vout, "scriptPubKey": scriptPubKey, "redeemScript": mredeem, "amount": value}]
|
||||
|
||||
node0.generate(1)
|
||||
self.generate(node0, 1)
|
||||
|
||||
outval = value - decimal.Decimal("0.00001000")
|
||||
rawtx = node2.createrawtransaction([{"txid": txid, "vout": vout}], [{self.final: outval}])
|
||||
@@ -215,7 +215,7 @@ class RpcCreateMultiSigTest(BitcoinTestFramework):
|
||||
|
||||
self.moved += outval
|
||||
tx = node0.sendrawtransaction(rawtx3["hex"], 0)
|
||||
blk = node0.generate(1)[0]
|
||||
blk = self.generate(node0, 1)[0]
|
||||
assert tx in node0.getblock(blk)["tx"]
|
||||
|
||||
txinfo = node0.getrawtransaction(tx, True, blk)
|
||||
|
Reference in New Issue
Block a user