diff --git a/test/functional/bip68-112-113-p2p.py b/test/functional/bip68-112-113-p2p.py --- a/test/functional/bip68-112-113-p2p.py +++ b/test/functional/bip68-112-113-p2p.py @@ -43,14 +43,11 @@ from test_framework.test_framework import ComparisonTestFramework from test_framework.util import * from test_framework.mininode import ToHex, FromHex, CTransaction, NetworkThread, COIN -from test_framework.blocktools import create_coinbase, create_block +from test_framework.blocktools import create_coinbase, create_block, make_conform_to_ctor from test_framework.comptool import TestInstance, TestManager from test_framework.script import * import time -# far in the future -MAGNETIC_ANOMALY_START_TIME = 2000000000 - base_relative_locktime = 10 seq_disable_flag = 1 << 31 seq_random_high_bit = 1 << 25 @@ -104,8 +101,7 @@ def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True - self.extra_args = [['-whitelist=127.0.0.1', '-blockversion=4', - '-magneticanomalyactivationtime=%d' % MAGNETIC_ANOMALY_START_TIME]] + self.extra_args = [['-whitelist=127.0.0.1', '-blockversion=4']] def run_test(self): test = TestManager(self, self.options.tmpdir) @@ -153,6 +149,7 @@ self.tipheight + 1), self.last_block_time + 600) block.nVersion = version block.vtx.extend(txs) + make_conform_to_ctor(block) block.hashMerkleRoot = block.calc_merkle_root() block.rehash() block.solve() @@ -168,6 +165,7 @@ block.nVersion = version block.vtx.extend(txs) block.vtx.extend([self.spend_tx(node, tx) for tx in txs]) + make_conform_to_ctor(block) block.hashMerkleRoot = block.calc_merkle_root() block.rehash() block.solve()