diff --git a/test/functional/abc-magnetic-anomaly-mining.py b/test/functional/abc-magnetic-anomaly-mining.py --- a/test/functional/abc-magnetic-anomaly-mining.py +++ b/test/functional/abc-magnetic-anomaly-mining.py @@ -25,8 +25,7 @@ self.blocks = {} self.mocktime = int(time.time()) - 600 * 100 - extra_arg = ['-spendzeroconfchange=0', '-whitelist=127.0.0.1', - "-replayprotectionactivationtime={}".format(10 * self.mocktime)] + extra_arg = ['-spendzeroconfchange=0', '-whitelist=127.0.0.1'] self.extra_args = [extra_arg, extra_arg] def run_test(self): diff --git a/test/functional/abc-p2p-fullblocktest.py b/test/functional/abc-p2p-fullblocktest.py --- a/test/functional/abc-p2p-fullblocktest.py +++ b/test/functional/abc-p2p-fullblocktest.py @@ -53,8 +53,6 @@ from test_framework.test_framework import BitcoinTestFramework from test_framework.util import assert_equal -REPLAY_PROTECTION_START_TIME = 2000000000 - class PreviousSpendableOutput(): @@ -74,8 +72,6 @@ self.blocks = {} self.excessive_block_size = 100 * ONE_MEGABYTE self.extra_args = [['-whitelist=127.0.0.1', - "-replayprotectionactivationtime={}".format( - REPLAY_PROTECTION_START_TIME), "-excessiveblocksize={}".format(self.excessive_block_size)]] def add_options(self, parser): diff --git a/test/functional/abc-transaction-ordering.py b/test/functional/abc-transaction-ordering.py --- a/test/functional/abc-transaction-ordering.py +++ b/test/functional/abc-transaction-ordering.py @@ -31,9 +31,6 @@ from test_framework.test_framework import BitcoinTestFramework from test_framework.util import assert_equal -# far into the future -REPLAY_PROTECTION_START_TIME = 2000000000 - class PreviousSpendableOutput(): @@ -51,8 +48,7 @@ self.tip = None self.blocks = {} self.extra_args = [['-whitelist=127.0.0.1', - '-relaypriority=0', - "-replayprotectionactivationtime={}".format(REPLAY_PROTECTION_START_TIME)]] + '-relaypriority=0']] def add_transactions_to_block(self, block, tx_list): [tx.rehash() for tx in tx_list]