Merge pull request #3099 from darwintree/parametize-eweb3

tests: parametize eweb3 using old and new rpc port

Author: Pana

integration_tests/test_framework/test_framework.py

@@ -350,12 +350,17 @@ def setup_w3(self):
         log = self.log
         self._cw3 = CWeb3(CWeb3.HTTPProvider(f'http://{self.nodes[0].ip}:{self.nodes[0].rpcport}/'))
         self._ew3 = Web3(Web3.HTTPProvider(f'http://{self.nodes[0].ip}:{self.nodes[0].ethrpcportv2}/'))
+        self._legacy_ew3 = Web3(Web3.HTTPProvider(f'http://{self.nodes[0].ip}:{self.nodes[0].ethrpcport}/'))
+
         self.cw3.wallet.add_accounts(self.core_accounts)
         self.cw3.cfx.default_account = self.core_accounts[0].address
 
         self.ew3.middleware_onion.add(SignAndSendRawMiddlewareBuilder.build(self.evm_secrets)) # type: ignore
         self.eth.default_account = self.evm_accounts[0].address
 
+        self._legacy_ew3.middleware_onion.add(SignAndSendRawMiddlewareBuilder.build(self.evm_secrets)) # type: ignore
+        self._legacy_ew3.eth.default_account = self.evm_accounts[0].address
+        
         class TestNodeMiddleware(ConfluxWeb3Middleware):
             def request_processor(self, method: RPCEndpoint, params: Any) -> Any:
                 if method == RPC.cfx_sendRawTransaction or method == RPC.cfx_sendTransaction or method == "eth_sendRawTransaction" or method == "eth_sendTransaction":
@@ -377,6 +382,7 @@ def response_processor(self, method: RPCEndpoint, response: Any):
 
         self.cw3.middleware_onion.add(TestNodeMiddleware)
         self.ew3.middleware_onion.add(TestNodeMiddleware)
+        self._legacy_ew3.middleware_onion.add(TestNodeMiddleware)
 
     def add_nodes(self, num_nodes, genesis_nodes=None, rpchost=None, binary=None, auto_recovery=False,
                   recovery_timeout=30, is_consortium=True):

integration_tests/tests/rpc/espace/conftest.py

@@ -17,6 +17,9 @@ def set_test_params(self):
             self.conf_parameters["next_hardfork_transition_height"] = 1
             self.conf_parameters["next_hardfork_transition_number"] = 1
             self.conf_parameters["public_evm_rpc_async_apis"] = "\"all\"" # open all async apis
+            self.conf_parameters["public_evm_rpc_apis"] = (
+                '"eth,ethdebug"'
+            )
             # self.conf_parameters["evm_chain_id"] = str(10)
             self.conf_parameters["evm_transaction_block_ratio"] = str(1)
             self.conf_parameters["executive_trace"] = "true"
@@ -28,6 +31,13 @@ def setup_network(self):
     return DefaultFramework
 
 
+@pytest.fixture(scope="module", params=["ew3_port_v1", "ew3_port_v2"])
+def ew3(network: ConfluxTestFramework, request):
+    if request.param == "ew3_port_v2":
+        return network.ew3
+    else:
+        return network._legacy_ew3
+
 @pytest.fixture(scope="module")
 def erc20_contract(ew3, evm_accounts):
     account = evm_accounts[0]

integration_tests/tests/rpc/espace/test_rpc_error.py

@@ -93,11 +93,12 @@ def test_same_nonce_higher_gas_price_required(ew3, evm_accounts):
         "nonce": nonce,
         "chainId": 10,
     })
-
+    
+    tx_hash = ew3.eth.send_raw_transaction(signed["raw_transaction"])
     with pytest.raises(Exception, match="{'code': -32603, 'message': 'already known'}"):
-        ew3.eth.send_raw_transaction(signed["raw_transaction"])
         time.sleep(1)
         ew3.eth.send_raw_transaction(signed["raw_transaction"])
+    ew3.eth.wait_for_transaction_receipt(tx_hash)
 
 def test_gas_too_low(ew3, evm_accounts):
     account = evm_accounts[0]