diff --git a/test/functional/abc-miner-fund.py b/test/functional/abc-miner-fund.py --- a/test/functional/abc-miner-fund.py +++ b/test/functional/abc-miner-fund.py @@ -32,8 +32,7 @@ def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 - self.extra_args = [ - ['-enableminerfund', "-phononactivationtime={}".format(PHONON_ACTIVATION_TIME)]] + self.extra_args = [['-enableminerfund']] def check_bip9_state(self, name, status): miner_fund_info = self.nodes[0].getblockchaininfo()['softforks'][name] @@ -110,8 +109,8 @@ version = VERSION_BASE | (1 << bit) self.stop_node(0) - self.start_node(0, - ['-enableminerfund', "-blockversion={}".format(version), "-phononactivationtime={}".format(PHONON_ACTIVATION_TIME)]) + self.start_node( + 0, ['-enableminerfund', "-blockversion={}".format(version)]) node = self.nodes[0] node.setmocktime(1580000000) diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py --- a/test/functional/mempool_packages.py +++ b/test/functional/mempool_packages.py @@ -14,15 +14,6 @@ satoshi_round, ) -# TODO: The activation code can be reverted after the new policy becomes -# active. - -# Phonon dummy activation time -ACTIVATION_TIME = 2000000000 - -# Replay protection time needs to be moved beyond phonon activation -REPLAY_PROTECTION_TIME = ACTIVATION_TIME * 2 - MAX_ANCESTORS = 50 MAX_DESCENDANTS = 50 @@ -30,11 +21,7 @@ class MempoolPackagesTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 - - common_params = ["-maxorphantx=1000", - "-phononactivationtime={}".format(ACTIVATION_TIME), - "-replayprotectionactivationtime={}".format(REPLAY_PROTECTION_TIME)] - + common_params = ["-maxorphantx=1000"] self.extra_args = [common_params, common_params + ["-limitancestorcount=5"]] @@ -59,8 +46,6 @@ return (txid, send_value) def run_test(self): - [n.setmocktime(ACTIVATION_TIME) for n in self.nodes] - # Mine some blocks and have them mature. self.nodes[0].generate(101) utxo = self.nodes[0].listunspent(10)