V7 support for request batching

newsfragments/3370.feature.rst

@@ -0,0 +1 @@
+Add support for request batching via ``w3.batch_requests()`` context manager (sync and async).

tests/integration/go_ethereum/common.py

@@ -17,6 +17,9 @@
     NetModuleTest,
     Web3ModuleTest,
 )
+from web3._utils.module_testing.web3_module import (
+    AsyncWeb3ModuleTest,
+)
 from web3.types import (
     BlockData,
 )
@@ -27,7 +30,7 @@
     )
 
 
-class GoEthereumTest(Web3ModuleTest):
+class GoEthereumWeb3ModuleTest(Web3ModuleTest):
     def _check_web3_client_version(self, client_version):
         assert client_version.startswith("Geth/")
 
@@ -85,12 +88,16 @@ class GoEthereumNetModuleTest(NetModuleTest):
     pass
 
 
-class GoEthereumAsyncNetModuleTest(AsyncNetModuleTest):
+class GoEthereumAdminModuleTest(GoEthereumAdminModuleTest):
     pass
 
 
-class GoEthereumAdminModuleTest(GoEthereumAdminModuleTest):
-    pass
+# --- async --- #
+
+
+class GoEthereumAsyncWeb3ModuleTest(AsyncWeb3ModuleTest):
+    def _check_web3_client_version(self, client_version):
+        assert client_version.startswith("Geth/")
 
 
 class GoEthereumAsyncEthModuleTest(AsyncEthModuleTest):
@@ -111,3 +118,7 @@ async def test_invalid_eth_sign_typed_data(
         await super().test_invalid_eth_sign_typed_data(
             async_w3, keyfile_account_address_dual_type, async_skip_if_testrpc
         )
+
+
+class GoEthereumAsyncNetModuleTest(AsyncNetModuleTest):
+    pass

tests/integration/go_ethereum/test_goethereum_http.py

@@ -21,10 +21,11 @@
     GoEthereumAsyncEthModuleTest,
     GoEthereumAsyncNetModuleTest,
     GoEthereumAsyncTxPoolModuleTest,
+    GoEthereumAsyncWeb3ModuleTest,
     GoEthereumEthModuleTest,
     GoEthereumNetModuleTest,
-    GoEthereumTest,
     GoEthereumTxPoolModuleTest,
+    GoEthereumWeb3ModuleTest,
 )
 from .utils import (
     wait_for_aiohttp,
@@ -70,7 +71,7 @@ def w3(geth_process, endpoint_uri):
     return Web3(Web3.HTTPProvider(endpoint_uri))
 
 
-class TestGoEthereumTest(GoEthereumTest):
+class TestGoEthereumWeb3ModuleTest(GoEthereumWeb3ModuleTest):
     pass
 
 
@@ -116,6 +117,10 @@ async def async_w3(geth_process, endpoint_uri):
     return _w3
 
 
+class TestGoEthereumAsyncWeb3ModuleTest(GoEthereumAsyncWeb3ModuleTest):
+    pass
+
+
 class TestGoEthereumAsyncAdminModuleTest(GoEthereumAsyncAdminModuleTest):
     @pytest.mark.asyncio
     @pytest.mark.xfail(

tests/integration/go_ethereum/test_goethereum_ipc.py

@@ -9,14 +9,18 @@
     AsyncWeb3,
     Web3,
 )
+from web3._utils.module_testing.persistent_connection_provider import (
+    PersistentConnectionProviderTest,
+)
 
 from .common import (
     GoEthereumAdminModuleTest,
     GoEthereumAsyncEthModuleTest,
     GoEthereumAsyncNetModuleTest,
+    GoEthereumAsyncWeb3ModuleTest,
     GoEthereumEthModuleTest,
     GoEthereumNetModuleTest,
-    GoEthereumTest,
+    GoEthereumWeb3ModuleTest,
 )
 from .utils import (
     wait_for_async_socket,
@@ -53,14 +57,15 @@ def w3(geth_process, geth_ipc_path):
     return Web3(Web3.IPCProvider(geth_ipc_path, timeout=30))
 
 
-@pytest_asyncio.fixture(scope="module")
-async def async_w3(geth_process, geth_ipc_path):
-    await wait_for_async_socket(geth_ipc_path)
-    async with AsyncWeb3(AsyncIPCProvider(geth_ipc_path)) as _aw3:
-        yield _aw3
+class TestGoEthereumWeb3ModuleTest(GoEthereumWeb3ModuleTest):
+    pass
 
 
-class TestGoEthereumTest(GoEthereumTest):
+class TestGoEthereumEthModuleTest(GoEthereumEthModuleTest):
+    pass
+
+
+class TestGoEthereumNetModuleTest(GoEthereumNetModuleTest):
     pass
 
 
@@ -84,17 +89,27 @@ def test_admin_start_stop_ws(self, w3: "Web3") -> None:
         super().test_admin_start_stop_ws(w3)
 
 
-class TestGoEthereumEthModuleTest(GoEthereumEthModuleTest):
+# -- async -- #
+
+
+@pytest_asyncio.fixture(scope="module")
+async def async_w3(geth_process, geth_ipc_path):
+    await wait_for_async_socket(geth_ipc_path)
+    async with AsyncWeb3(AsyncIPCProvider(geth_ipc_path)) as _aw3:
+        yield _aw3
+
+
+class TestGoEthereumAsyncWeb3ModuleTest(GoEthereumAsyncWeb3ModuleTest):
     pass
 
 
 class TestGoEthereumAsyncEthModuleTest(GoEthereumAsyncEthModuleTest):
     pass
 
 
-class TestGoEthereumNetModuleTest(GoEthereumNetModuleTest):
+class TestGoEthereumAsyncNetModuleTest(GoEthereumAsyncNetModuleTest):
     pass
 
 
-class TestGoEthereumAsyncNetModuleTest(GoEthereumAsyncNetModuleTest):
+class TestPersistentConnectionProviderTest(PersistentConnectionProviderTest):
     pass

tests/integration/go_ethereum/test_goethereum_legacy_ws.py

@@ -17,7 +17,7 @@
     GoEthereumAdminModuleTest,
     GoEthereumEthModuleTest,
     GoEthereumNetModuleTest,
-    GoEthereumTest,
+    GoEthereumWeb3ModuleTest,
 )
 
 
@@ -70,7 +70,7 @@ def w3(geth_process, endpoint_uri):
     return _w3
 
 
-class TestGoEthereumTest(GoEthereumTest):
+class TestGoEthereumWeb3ModuleTest(GoEthereumWeb3ModuleTest):
     pass
 
 

tests/integration/go_ethereum/test_goethereum_ws/test_async_await_w3.py

@@ -16,6 +16,7 @@
 from ..common import (
     GoEthereumAsyncEthModuleTest,
     GoEthereumAsyncNetModuleTest,
+    GoEthereumAsyncWeb3ModuleTest,
 )
 from ..utils import (
     wait_for_aiohttp,
@@ -30,6 +31,10 @@ async def async_w3(geth_process, endpoint_uri):
     return await AsyncWeb3(WebSocketProvider(endpoint_uri))
 
 
+class TestGoEthereumAsyncWeb3ModuleTest(GoEthereumAsyncWeb3ModuleTest):
+    pass
+
+
 class TestGoEthereumAsyncAdminModuleTest(GoEthereumAsyncAdminModuleTest):
     @pytest.mark.asyncio
     @pytest.mark.xfail(

tests/integration/go_ethereum/test_goethereum_ws/test_async_ctx_manager_w3.py

@@ -16,6 +16,7 @@
 from ..common import (
     GoEthereumAsyncEthModuleTest,
     GoEthereumAsyncNetModuleTest,
+    GoEthereumAsyncWeb3ModuleTest,
 )
 from ..utils import (
     wait_for_aiohttp,
@@ -31,6 +32,10 @@ async def async_w3(geth_process, endpoint_uri):
         yield w3
 
 
+class TestGoEthereumAsyncWeb3ModuleTest(GoEthereumAsyncWeb3ModuleTest):
+    pass
+
+
 class TestGoEthereumAsyncAdminModuleTest(GoEthereumAsyncAdminModuleTest):
     @pytest.mark.asyncio
     @pytest.mark.xfail(

tests/integration/go_ethereum/test_goethereum_ws/test_async_iterator_w3.py

@@ -16,6 +16,7 @@
 from ..common import (
     GoEthereumAsyncEthModuleTest,
     GoEthereumAsyncNetModuleTest,
+    GoEthereumAsyncWeb3ModuleTest,
 )
 from ..utils import (
     wait_for_aiohttp,
@@ -31,6 +32,10 @@ async def async_w3(geth_process, endpoint_uri):
         return w3
 
 
+class TestGoEthereumAsyncWeb3ModuleTest(GoEthereumAsyncWeb3ModuleTest):
+    pass
+
+
 class TestGoEthereumAsyncAdminModuleTest(GoEthereumAsyncAdminModuleTest):
     @pytest.mark.asyncio
     @pytest.mark.xfail(

tests/integration/test_ethereum_tester.py

@@ -38,6 +38,7 @@
 )
 from web3.exceptions import (
     MethodUnavailable,
+    Web3TypeError,
 )
 from web3.providers.eth_tester import (
     EthereumTesterProvider,
@@ -221,11 +222,6 @@ def keyfile_account_address_dual_type(keyfile_account_address, address_conversio
     yield keyfile_account_address
 
 
-class TestEthereumTesterWeb3Module(Web3ModuleTest):
-    def _check_web3_client_version(self, client_version):
-        assert client_version.startswith("EthereumTester/")
-
-
 def not_implemented(method, exc_type=NotImplementedError):
     @functools.wraps(method)
     def inner(*args, **kwargs):
@@ -250,6 +246,28 @@ def func_wrapper(self, eth_tester, *args, **kwargs):
     return func_wrapper
 
 
+class TestEthereumTesterWeb3Module(Web3ModuleTest):
+    def _check_web3_client_version(self, client_version):
+        assert client_version.startswith("EthereumTester/")
+
+    test_batch_requests = not_implemented(
+        Web3ModuleTest.test_batch_requests, Web3TypeError
+    )
+    test_batch_requests_raises_for_common_unsupported_methods = not_implemented(
+        Web3ModuleTest.test_batch_requests_raises_for_common_unsupported_methods,
+        Web3TypeError,
+    )
+    test_batch_requests_initialized_as_object = not_implemented(
+        Web3ModuleTest.test_batch_requests_initialized_as_object, Web3TypeError
+    )
+    test_batch_requests_cancel = not_implemented(
+        Web3ModuleTest.test_batch_requests_cancel, Web3TypeError
+    )
+    test_batch_requests_clear = not_implemented(
+        Web3ModuleTest.test_batch_requests_clear, Web3TypeError
+    )
+
+
 class TestEthereumTesterEthModule(EthModuleTest):
     test_eth_sign = not_implemented(EthModuleTest.test_eth_sign, MethodUnavailable)
     test_eth_sign_ens_names = not_implemented(