From c4da01bfae8275817bf81d530f0501b2e0330efa Mon Sep 17 00:00:00 2001 From: Tom Harding Date: Tue, 17 Nov 2015 13:32:15 +0100 Subject: [PATCH] Adapt CLTV regtest for XT changes Conflicts: qa/rpc-tests/bip65-cltv-p2p.py qa/rpc-tests/bip65-cltv.py --- qa/rpc-tests/bip65-cltv-p2p.py | 12 ++++----- qa/rpc-tests/bip65-cltv.py | 45 +++++++++++++++++----------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py index 9b1fdd93508..ea4b5d2d23d 100755 --- a/qa/rpc-tests/bip65-cltv-p2p.py +++ b/qa/rpc-tests/bip65-cltv-p2p.py @@ -85,9 +85,9 @@ class BIP65Test(ComparisonTestFramework): height += 1 yield TestInstance(test_blocks, sync_every_block=False) - ''' Mine 749 version 4 blocks ''' + ''' Mine 74 version 4 blocks ''' test_blocks = [] - for i in xrange(749): + for i in xrange(74): block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1) block.nVersion = 4 block.rehash() @@ -99,7 +99,7 @@ class BIP65Test(ComparisonTestFramework): yield TestInstance(test_blocks, sync_every_block=False) ''' - Check that the new CLTV rules are not enforced in the 750th + Check that the new CLTV rules are not enforced in the 75th version 3 block. ''' spendtx = self.create_transaction(self.nodes[0], @@ -120,7 +120,7 @@ class BIP65Test(ComparisonTestFramework): yield TestInstance([[block, True]]) ''' - Check that the new CLTV rules are enforced in the 751st version 4 + Check that the new CLTV rules are enforced in the 76th version 4 block. ''' spendtx = self.create_transaction(self.nodes[0], @@ -137,9 +137,9 @@ class BIP65Test(ComparisonTestFramework): self.last_block_time += 1 yield TestInstance([[block, False]]) - ''' Mine 199 new version blocks on last valid tip ''' + ''' Mine 19 new version blocks on last valid tip ''' test_blocks = [] - for i in xrange(199): + for i in xrange(19): block = create_block(self.tip, create_coinbase(height), self.last_block_time + 1) block.nVersion = 4 block.rehash() diff --git a/qa/rpc-tests/bip65-cltv.py b/qa/rpc-tests/bip65-cltv.py index f666a07c9b7..15c7c0e3cf7 100755 --- a/qa/rpc-tests/bip65-cltv.py +++ b/qa/rpc-tests/bip65-cltv.py @@ -9,6 +9,8 @@ from test_framework.test_framework import BitcoinTestFramework from test_framework.util import * +import os +import shutil class BIP65Test(BitcoinTestFramework): @@ -26,61 +28,60 @@ class BIP65Test(BitcoinTestFramework): cnt = self.nodes[0].getblockcount() # Mine some old-version blocks - self.nodes[1].generate(100) + self.nodes[1].generate(10) self.sync_all() - if (self.nodes[0].getblockcount() != cnt + 100): - raise AssertionError("Failed to mine 100 version=3 blocks") + if (self.nodes[0].getblockcount() != cnt + 10): + raise AssertionError("Failed to mine 10 version=3 blocks") - # Mine 750 new-version blocks + # Mine 75 new-version blocks for i in xrange(15): - self.nodes[2].generate(50) + self.nodes[2].generate(5) self.sync_all() - if (self.nodes[0].getblockcount() != cnt + 850): - raise AssertionError("Failed to mine 750 version=4 blocks") + if (self.nodes[0].getblockcount() != cnt + 85): + raise AssertionError("Failed to mine 75 version=4 blocks") # TODO: check that new CHECKLOCKTIMEVERIFY rules are not enforced # Mine 1 new-version block self.nodes[2].generate(1) self.sync_all() - if (self.nodes[0].getblockcount() != cnt + 851): - raise AssertionError("Failed to mine a version=4 blocks") + if (self.nodes[0].getblockcount() != cnt + 86): + raise AssertionFailure("Failed to mine a version=4 block") # TODO: check that new CHECKLOCKTIMEVERIFY rules are enforced - # Mine 198 new-version blocks - for i in xrange(2): - self.nodes[2].generate(99) + # Mine 18 new-version blocks + self.nodes[2].generate(18) self.sync_all() - if (self.nodes[0].getblockcount() != cnt + 1049): - raise AssertionError("Failed to mine 198 version=4 blocks") + if (self.nodes[0].getblockcount() != cnt + 104): + raise AssertionError("Failed to mine 18 version=4 blocks") # Mine 1 old-version block self.nodes[1].generate(1) self.sync_all() - if (self.nodes[0].getblockcount() != cnt + 1050): - raise AssertionError("Failed to mine a version=3 block after 949 version=4 blocks") + if (self.nodes[0].getblockcount() != cnt + 105): + raise AssertionError("Failed to mine a version=3 block after 94 version=4 blocks") # Mine 1 new-version blocks self.nodes[2].generate(1) self.sync_all() - if (self.nodes[0].getblockcount() != cnt + 1051): - raise AssertionError("Failed to mine a version=4 block") + if (self.nodes[0].getblockcount() != cnt + 106): + raise AssertionError("Failed to mine a version=3 block") # Mine 1 old-version blocks try: self.nodes[1].generate(1) - raise AssertionError("Succeeded to mine a version=3 block after 950 version=4 blocks") + raise AssertionError("Succeeded to mine a version=3 block after 95 version=4 blocks") except JSONRPCException: pass self.sync_all() - if (self.nodes[0].getblockcount() != cnt + 1051): - raise AssertionError("Accepted a version=3 block after 950 version=4 blocks") + if (self.nodes[0].getblockcount() != cnt + 106): + raise AssertionError("Accepted a version=3 block after 95 version=4 blocks") # Mine 1 new-version blocks self.nodes[2].generate(1) self.sync_all() - if (self.nodes[0].getblockcount() != cnt + 1052): + if (self.nodes[0].getblockcount() != cnt + 107): raise AssertionError("Failed to mine a version=4 block") if __name__ == '__main__':