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/invalidateblock.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/invalidateblock.py')
-rwxr-xr-x | qa/rpc-tests/invalidateblock.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/rpc-tests/invalidateblock.py b/qa/rpc-tests/invalidateblock.py index ccfcf00e30..fd8a8e5785 100755 --- a/qa/rpc-tests/invalidateblock.py +++ b/qa/rpc-tests/invalidateblock.py @@ -28,12 +28,12 @@ class InvalidateTest(BitcoinTestFramework): def run_test(self): print "Make sure we repopulate setBlockIndexCandidates after InvalidateBlock:" print "Mine 4 blocks on Node 0" - self.nodes[0].setgenerate(True, 4) + self.nodes[0].generate(4) assert(self.nodes[0].getblockcount() == 4) besthash = self.nodes[0].getbestblockhash() print "Mine competing 6 blocks on Node 1" - self.nodes[1].setgenerate(True, 6) + self.nodes[1].generate(6) assert(self.nodes[1].getblockcount() == 6) print "Connect nodes to force a reorg" @@ -61,7 +61,7 @@ class InvalidateTest(BitcoinTestFramework): self.nodes[2].invalidateblock(self.nodes[2].getblockhash(3)) assert(self.nodes[2].getblockcount() == 2) print "..and then mine a block" - self.nodes[2].setgenerate(True, 1) + self.nodes[2].generate(1) print "Verify all nodes are at the right height" time.sleep(5) for i in xrange(3): |