Skip to content

Commit afb8350

Browse files
committed
refactor: replace ConfluxTestFramework with DefaultDevFramework in tests and adjust parameters
1 parent 062e0c9 commit afb8350

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

integration_tests/test_framework/framework_templates.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ class DefaultDevFramework(ConfluxTestFramework):
2121
def set_test_params(self):
2222
self.num_nodes = 1
2323
self.conf_parameters["mode"] = "'dev'"
24-
self.conf_parameters["min_native_base_price"] = 10000
25-
self.conf_parameters["base_fee_burn_transition_height"] = 1
26-
self.conf_parameters["base_fee_burn_transition_number"] = 1
2724

2825
def setup_network(self):
2926
self.setup_nodes()

integration_tests/tests/cross_space/phantom_transaction_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from conflux_web3 import Web3
33
import pytest
44
from integration_tests.conflux.rpc import RpcClient
5-
from integration_tests.test_framework.test_framework import ConfluxTestFramework
5+
from integration_tests.test_framework.framework_templates import DefaultDevFramework
66
from integration_tests.test_framework.util import assert_equal, assert_is_hex_string, assert_ne, load_contract_metadata
77
from eth_utils import decode_hex, encode_hex as encode_hex_0x
88

@@ -16,9 +16,9 @@
1616

1717
@pytest.fixture(scope="module")
1818
def framework_class():
19-
class PhantomTransactionTestEnv(ConfluxTestFramework):
19+
class PhantomTransactionTestEnv(DefaultDevFramework):
2020
def set_test_params(self):
21-
self.num_nodes = 1
21+
super().set_test_params()
2222
self.conf_parameters["chain_id"] = str(10)
2323
self.conf_parameters["evm_chain_id"] = str(11)
2424
self.conf_parameters["evm_transaction_block_ratio"] = str(1)

integration_tests/tests/cross_space/phantom_tx_hash_test.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
import pytest
33

44
from integration_tests.test_framework.test_framework import ConfluxTestFramework
5+
from integration_tests.test_framework.framework_templates import DefaultDevFramework
56
from eth_utils import decode_hex
67

78

89
@pytest.fixture(scope="module")
910
def framework_class() -> Type[ConfluxTestFramework]:
10-
class DefaultFramework(ConfluxTestFramework):
11+
class DefaultFramework(DefaultDevFramework):
1112

1213
def set_test_params(self):
13-
self.num_nodes = 1
14+
super().set_test_params()
1415
self.core_secrets.append(decode_hex("46b9e861b63d3509c88b7817275a30d22d62c8cd8fa6486ddee35ef0d8e0495a").hex())
1516

1617
def setup_network(self):

integration_tests/tests/rpc/conftest.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,14 @@ def client(network: ConfluxTestFramework) -> RpcClient:
1010

1111
@pytest.fixture(scope="module")
1212
def framework_class():
13-
return DefaultDevFramework
13+
class InternalContractTestEnv(DefaultDevFramework):
14+
def set_test_params(self):
15+
super().set_test_params()
16+
self.conf_parameters["min_native_base_price"] = 10000
17+
self.conf_parameters["base_fee_burn_transition_height"] = 1
18+
self.conf_parameters["base_fee_burn_transition_number"] = 1
19+
20+
def setup_network(self):
21+
self.add_nodes(self.num_nodes)
22+
self.start_node(0, ["--archive"])
23+
return InternalContractTestEnv

0 commit comments

Comments
 (0)