Put back timeout check on ccip read tests; close sessions appropriately.

Author: fselmo

web3/_utils/module_testing/module_testing_utils.py

@@ -12,7 +12,10 @@
     Union,
 )
 
-import aiohttp
+from aiohttp import (
+    ClientSession,
+    ClientTimeout,
+)
 from eth_typing import (
     ChecksumAddress,
     HexStr,
@@ -28,14 +31,19 @@
 )
 import requests
 
+from web3._utils.http import (
+    DEFAULT_HTTP_TIMEOUT,
+)
 from web3.types import (
     BlockData,
     LogReceipt,
 )
 
 if TYPE_CHECKING:
     from _pytest.monkeypatch import MonkeyPatch  # noqa: F401
-    from aiohttp import ClientResponse  # noqa: F401
+    from aiohttp import (  # noqa: F401
+        ClientResponse,
+    )
     from requests import Response  # noqa: F401
 
     from web3 import Web3  # noqa: F401
@@ -97,6 +105,7 @@ def _mock_specific_request(
 
         # mock response only to specified url while validating appropriate fields
         if url_from_args == mocked_request_url:
+            assert kwargs["timeout"] == DEFAULT_HTTP_TIMEOUT
             if http_method.upper() == "POST":
                 assert kwargs["data"] == {"data": calldata, "sender": sender}
             return MockedResponse()
@@ -146,15 +155,18 @@ async def _mock_specific_request(
 
         # mock response only to specified url while validating appropriate fields
         if url_from_args == mocked_request_url:
+            assert kwargs["timeout"] == ClientTimeout(DEFAULT_HTTP_TIMEOUT)
             if http_method.upper() == "post":
                 assert kwargs["data"] == {"data": calldata, "sender": sender}
             return AsyncMockedResponse()
 
         # else, make a normal request (no mocking)
-        session = aiohttp.ClientSession()
-        return await session.request(
+        session = ClientSession()
+        response = await session.request(
             method=http_method.upper(), url=url_from_args, **kwargs
         )
+        await session.close()
+        return response
 
     monkeypatch.setattr(
         f"aiohttp.ClientSession.{http_method.lower()}", _mock_specific_request

web3/utils/async_exception_handling.py

@@ -54,7 +54,7 @@ async def async_handle_offchain_lookup(
         try:
             if "{data}" in url and "{sender}" in url:
                 response = await session.get(
-                    formatted_url, timeout=DEFAULT_HTTP_TIMEOUT
+                    formatted_url, timeout=ClientTimeout(DEFAULT_HTTP_TIMEOUT)
                 )
             elif "{sender}" in url:
                 response = await session.post(
@@ -63,20 +63,23 @@ async def async_handle_offchain_lookup(
                     timeout=ClientTimeout(DEFAULT_HTTP_TIMEOUT),
                 )
             else:
+                await session.close()
                 raise Web3ValidationError("url not formatted properly.")
         except Exception:
             continue  # try next url if timeout or issues making the request
 
         if (
             400 <= response.status <= 499
         ):  # if request returns 400 error, raise exception
+            await session.close()
             response.raise_for_status()
         if not 200 <= response.status <= 299:  # if not 400 error, try next url
             continue
 
         result = await response.json()
 
         if "data" not in result.keys():
+            await session.close()
             raise Web3ValidationError(
                 "Improperly formatted response for offchain lookup HTTP request"
                 " - missing 'data' field."
@@ -97,5 +100,8 @@ async def async_handle_offchain_lookup(
             ]
         )
 
+        await session.close()
         return encoded_data_with_function_selector
+
+    await session.close()
     raise MultipleFailedRequests("Offchain lookup failed for supplied urls.")

web3/utils/exception_handling.py

@@ -11,6 +11,9 @@
 )
 import requests
 
+from web3._utils.http import (
+    DEFAULT_HTTP_TIMEOUT,
+)
 from web3._utils.type_conversion import (
     to_bytes_if_hex,
     to_hex_if_bytes,
@@ -47,14 +50,15 @@ def handle_offchain_lookup(
 
         try:
             if "{data}" in url and "{sender}" in url:
-                response = session.get(formatted_url)
+                response = session.get(formatted_url, timeout=DEFAULT_HTTP_TIMEOUT)
             elif "{sender}" in url:
                 response = session.post(
                     formatted_url,
                     data={
                         "data": formatted_data,
                         "sender": formatted_sender,
                     },
+                    timeout=DEFAULT_HTTP_TIMEOUT,
                 )
             else:
                 raise Web3ValidationError("url not formatted properly.")