Merge #11399: Fix bip68-sequence rpc test

49f869f Fix bip68-sequence rpc test (Johnson Lau)

Pull request description:

  The test mined 1 extra block for the ACTIVE state. Test added to catch the right moment of LOCKED_IN->ACTIVE transaction

Tree-SHA512: a42477cf0b137e7e3b7c6c7b2530101cfad4e4f59866170b8fc0d655c43b3144aad6bca4287a4a8df4c28d7cf08d3f8df166975ad2e8dcb7d2cc15de60cf11cd
This commit is contained in:
Wladimir J. van der Laan 2017-10-02 14:48:37 +02:00 committed by Alexander Block
parent 5c0e3ea6ef
commit 377a8fae2e

View File

@ -369,11 +369,14 @@ class BIP68Test(BitcoinTestFramework):
def activateCSV(self): def activateCSV(self):
# activation should happen at block height 432 (3 periods) # activation should happen at block height 432 (3 periods)
# getblockchaininfo will show CSV as active at block 431 (144 * 3 -1) since it's returning whether CSV is active for the next block.
min_activation_height = 432 min_activation_height = 432
height = self.nodes[0].getblockcount() height = self.nodes[0].getblockcount()
assert(height < min_activation_height) assert_greater_than(min_activation_height - height, 2)
self.nodes[0].generate(min_activation_height-height) self.nodes[0].generate(min_activation_height - height - 2)
assert(get_bip9_status(self.nodes[0], 'csv')['status'] == 'active') assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], "locked_in")
self.nodes[0].generate(1)
assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], "active")
sync_blocks(self.nodes) sync_blocks(self.nodes)
# Use self.nodes[1] to test that version 2 transactions are standard. # Use self.nodes[1] to test that version 2 transactions are standard.