Merge pull request #43 from lidofinance/change-log-level

Change log level to debug

Author: F4ever

.github/workflows/tests.yml

@@ -9,12 +9,16 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v4.5.0
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.9
+        python-version: '3.11'
 
-    - uses: Gr1N/setup-poetry@v7
+    - name: Setup poetry
+      run: |
+        curl -sSL https://install.python-poetry.org/ | python - && echo "$HOME/.poetry/bin" >> $GITHUB_PATH
+      env:
+        POETRY_VERSION: 1.8.2
 
     - name: Install dependencies
       run: |

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project are documented in this file.
 This changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [1.0.0] - 2024-07-29
+### Added
+- Support for Python 3.11
+
+### Fixed
+- All logs are now debug level
+- Endpoint addresses removed from logs
+
 # [0.6.0] - 2023-03-29
 ### Added
 - FallbackProvider.

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "web3-multi-provider"
-version = "0.6.0"
+version = "1.0.0"
 description = "Web3py provider that makes it easy to switch between different blockchain nodes to make sure application will be be online if main blockchain node will be unavailable."
 authors = ["Raman <[email protected]>"]
 license = "MIT License"

pyproject.toml

@@ -8,7 +8,6 @@
 from web3_multi_provider import MultiProvider
 from web3_multi_provider.multi_http_provider import (
     FallbackProvider,
-    MultiHTTPProvider,
     NoActiveProviderError,
     ProtocolNotSupported,
 )
@@ -40,11 +39,6 @@ class HttpProviderTestCase(TestCase):
     def __inject_fixtures(self, caplog):
         self._caplog = caplog
 
-    @patch("web3.providers.rpc.make_post_request", side_effect=mocked_requests_get)
-    def test_one_http_provider_works(self, make_post_request):
-        # Ignore deprecation warnings
-        self.one_provider_works(MultiHTTPProvider)
-
     @patch("web3.providers.rpc.make_post_request", side_effect=mocked_requests_get)
     def test_one_provider_works(self, make_post_request):
         self.one_provider_works(MultiProvider)
@@ -62,12 +56,12 @@ def test_nothing_works(self, make_post_request):
 
         w3 = Web3(provider)
 
-        with self._caplog.at_level(logging.INFO):
+        with self._caplog.at_level(logging.DEBUG):
             with self.assertRaises(NoActiveProviderError):
                 w3.eth.get_block("latest")
 
         # Make sure there is no inf recursion
-        self.assertEqual(len(self._caplog.records), 3)
+        self.assertEqual(len(self._caplog.records), 6)
 
     def one_provider_works(self, provider_class):
         provider = provider_class(
@@ -87,7 +81,6 @@ def one_provider_works(self, provider_class):
             {
                 "msg": "Provider not responding.",
                 "error": "Mocked connection error.",
-                "provider": "http://127.0.0.1:9001",
             },
             self._caplog.records[2].msg,
         )
@@ -96,7 +89,6 @@ def one_provider_works(self, provider_class):
                 "msg": "Send request using MultiProvider.",
                 "method": "eth_getBlockByNumber",
                 "params": "('latest', False)",
-                "provider": "http://127.0.0.1:9000",
             },
             self._caplog.records[5].msg,
         )
@@ -106,7 +98,6 @@ def one_provider_works(self, provider_class):
                 "msg": "Send request using MultiProvider.",
                 "method": "eth_getBlockByNumber",
                 "params": "('latest', False)",
-                "provider": "http://127.0.0.1:9000",
             },
             self._caplog.records[9].msg,
         )

tests/test_http_provider.py

@@ -1,14 +1,12 @@
 from .multi_http_provider import (
     FallbackProvider,
-    MultiHTTPProvider,
     MultiProvider,
     NoActiveProviderError,
     ProtocolNotSupported,
 )
 
 __all__ = (
     "FallbackProvider",
-    "MultiHTTPProvider",
     "MultiProvider",
     "NoActiveProviderError",
     "ProtocolNotSupported",

web3_multi_provider/__init__.py

@@ -85,11 +85,10 @@ def make_request(self, method: RPCEndpoint, params: Any) -> RPCResponse:
         try:
             response = provider.make_request(method, params)
         except Exception as error:  # pylint: disable=W0703
-            logger.warning(
+            logger.debug(
                 {
                     "msg": "Provider not responding.",
                     "error": str(error),
-                    "provider": provider.endpoint_uri,
                 }
             )
 
@@ -103,7 +102,7 @@ def make_request(self, method: RPCEndpoint, params: Any) -> RPCResponse:
 
             if self._last_working_provider_index == self._current_provider_index:
                 msg = "No active provider available."
-                logger.error({"msg": msg})
+                logger.debug({"msg": msg})
                 raise NoActiveProviderError(msg) from error
 
             return self.make_request(method, params)
@@ -116,11 +115,9 @@ def make_request(self, method: RPCEndpoint, params: Any) -> RPCResponse:
                     "msg": "Send request using MultiProvider.",
                     "method": method,
                     "params": str(params),
-                    "provider": provider.endpoint_uri,
                 }
             )
             self._last_working_provider_index = self._current_provider_index
-
             return response
 
 
@@ -132,11 +129,10 @@ def make_request(self, method: RPCEndpoint, params: Any) -> RPCResponse:
             try:
                 response = provider.make_request(method, params)
             except Exception as error:  # pylint: disable=broad-except
-                logger.warning(
+                logger.debug(
                     {
                         "msg": "Provider not responding.",
                         "error": str(error),
-                        "provider": provider.endpoint_uri,
                     }
                 )
             else:
@@ -147,32 +143,9 @@ def make_request(self, method: RPCEndpoint, params: Any) -> RPCResponse:
                         "msg": "Send request using FallbackProvider.",
                         "method": method,
                         "params": str(params),
-                        "provider": provider.endpoint_uri,
                     }
                 )
                 return response
-
         msg = "No active provider available."
-        logger.error({"msg": msg})
+        logger.debug({"msg": msg})
         raise NoActiveProviderError(msg)
-
-
-class MultiHTTPProvider(MultiProvider):
-    """
-    Deprecated. Use MultiProvider instead
-    """
-
-    def __init__(
-        self,
-        endpoint_urls: List[Union[URI, str]],
-        request_kwargs: Optional[Any] = None,
-        session: Optional[Any] = None,
-    ):
-        import warnings  # pylint: disable=import-outside-toplevel
-
-        warnings.warn(
-            "MultiHTTPProvider is deprecated. Use MultiProvider instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        super().__init__(endpoint_urls, request_kwargs, session)