diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-09 11:59:17 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-09 15:23:09 +0200 |
commit | 57026a29bcbc7538526d4e77951833ae61f8690f (patch) | |
tree | d654f0e8638dbdc0675ec6b5da2a47e3ef609116 /qa/rpc-tests/mempool_resurrect_test.py | |
parent | 7efc9cf672acd752521a79c1547d232b2ca3486b (diff) | |
parent | e2edf95cd3f43331843676e49a82830128a95050 (diff) | |
download | bitcoin-57026a29bcbc7538526d4e77951833ae61f8690f.tar.xz |
Merge pull request #5957
e2edf95 Bugfix: make CreateNewBlock return pindexPrev (Pieter Wuille)
6b04508 Introduce separate 'generate' RPC call (Pieter Wuille)
0df67f1 Simplify hash loop code (Pieter Wuille)
Diffstat (limited to 'qa/rpc-tests/mempool_resurrect_test.py')
-rwxr-xr-x | qa/rpc-tests/mempool_resurrect_test.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/rpc-tests/mempool_resurrect_test.py b/qa/rpc-tests/mempool_resurrect_test.py index 81db812bfc..6f7f577e36 100755 --- a/qa/rpc-tests/mempool_resurrect_test.py +++ b/qa/rpc-tests/mempool_resurrect_test.py @@ -51,12 +51,12 @@ class MempoolCoinbaseTest(BitcoinTestFramework): spends1_id = [ self.nodes[0].sendrawtransaction(tx) for tx in spends1_raw ] blocks = [] - blocks.extend(self.nodes[0].setgenerate(True, 1)) + blocks.extend(self.nodes[0].generate(1)) spends2_raw = [ self.create_tx(txid, node0_address, 49.99) for txid in spends1_id ] spends2_id = [ self.nodes[0].sendrawtransaction(tx) for tx in spends2_raw ] - blocks.extend(self.nodes[0].setgenerate(True, 1)) + blocks.extend(self.nodes[0].generate(1)) # mempool should be empty, all txns confirmed assert_equal(set(self.nodes[0].getrawmempool()), set()) @@ -76,7 +76,7 @@ class MempoolCoinbaseTest(BitcoinTestFramework): assert(tx["confirmations"] == 0) # Generate another block, they should all get mined - self.nodes[0].setgenerate(True, 1) + self.nodes[0].generate(1) # mempool should be empty, all txns confirmed assert_equal(set(self.nodes[0].getrawmempool()), set()) for txid in spends1_id+spends2_id: |