diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py index 1080e77c40..33ee2f3af4 100755 --- a/test/functional/feature_block.py +++ b/test/functional/feature_block.py @@ -89,7 +89,6 @@ def set_test_params(self): self.setup_clean_chain = True self.extra_args = [[ '-acceptnonstdtxn=1', # This is a consensus block test, we don't care about tx policy - '-testactivationheight=bip34@2', ]] def run_test(self): diff --git a/test/functional/feature_cltv.py b/test/functional/feature_cltv.py index 7730db9672..c864931fbb 100755 --- a/test/functional/feature_cltv.py +++ b/test/functional/feature_cltv.py @@ -84,8 +84,7 @@ class BIP65Test(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 self.extra_args = [[ - f'-testactivationheight=cltv@{CLTV_HEIGHT}', - '-whitelist=noban@127.0.0.1', + f'-whitelist=noban@127.0.0.1', '-par=1', # Use only one script thread to get the exact reject reason for testing '-acceptnonstdtxn=1', # cltv_invalidate is nonstandard ]] @@ -93,12 +92,8 @@ def set_test_params(self): self.rpc_timeout = 480 def test_cltv_info(self, *, is_active): - assert_equal(self.nodes[0].getdeploymentinfo()['deployments']['bip65'], { - "active": is_active, - "height": CLTV_HEIGHT, - "type": "buried", - }, - ) + # Blackcoin: assume that CLTV is always active + pass def run_test(self): peer = self.nodes[0].add_p2p_connection(P2PInterface()) diff --git a/test/functional/feature_dersig.py b/test/functional/feature_dersig.py index 4a66863d91..06b73cb1ee 100755 --- a/test/functional/feature_dersig.py +++ b/test/functional/feature_dersig.py @@ -48,8 +48,7 @@ class BIP66Test(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 self.extra_args = [[ - f'-testactivationheight=dersig@{DERSIG_HEIGHT}', - '-whitelist=noban@127.0.0.1', + f'-whitelist=noban@127.0.0.1', '-par=1', # Use only one script thread to get the exact log msg for testing ]] self.setup_clean_chain = True @@ -60,13 +59,8 @@ def create_tx(self, input_txid): return self.miniwallet.create_self_transfer(utxo_to_spend=utxo_to_spend)['tx'] def test_dersig_info(self, *, is_active): - assert_equal(self.nodes[0].getdeploymentinfo()['deployments']['bip66'], - { - "active": is_active, - "height": DERSIG_HEIGHT, - "type": "buried", - }, - ) + # Blackcoin: assume that DERSIG is always active + pass def run_test(self): peer = self.nodes[0].add_p2p_connection(P2PInterface()) diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py index 6022042c11..5b44a9e934 100755 --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -167,10 +167,6 @@ def _test_getblockchaininfo(self): extra_args=['-testactivationheight=name@2'], expected_msg='Error: Invalid name (name@2) for -testactivationheight=name@height.', ) - self.nodes[0].assert_start_raises_init_error( - extra_args=['-testactivationheight=bip34@-2'], - expected_msg='Error: Invalid height value (bip34@-2) for -testactivationheight=name@height.', - ) self.nodes[0].assert_start_raises_init_error( extra_args=['-testactivationheight='], expected_msg='Error: Invalid format () for -testactivationheight=name@height.', @@ -198,9 +194,6 @@ def check_signalling_deploymentinfo_result(self, gdi_result, height, blockhash, "hash": blockhash, "height": height, "deployments": { - 'bip34': {'type': 'buried', 'active': True, 'height': 2}, - 'bip66': {'type': 'buried', 'active': True, 'height': 3}, - 'bip65': {'type': 'buried', 'active': True, 'height': 4}, 'csv': {'type': 'buried', 'active': True, 'height': 5}, 'segwit': {'type': 'buried', 'active': True, 'height': 6}, 'testdummy': { @@ -247,9 +240,6 @@ def _test_getdeploymentinfo(self): self.log.info("Test getdeploymentinfo") self.stop_node(0) self.start_node(0, extra_args=[ - '-testactivationheight=bip34@2', - '-testactivationheight=dersig@3', - '-testactivationheight=cltv@4', '-testactivationheight=csv@5', '-testactivationheight=segwit@6', ])