fix

Author: BobTheBuidler

faster_web3/providers/persistent/subscription_manager.py

@@ -1,4 +1,5 @@
 import asyncio
+import functools
 import logging
 from typing import (
     TYPE_CHECKING,
@@ -139,6 +140,7 @@ async def subscribe(
         self, subscriptions: Sequence[EthSubscription[Any]]
     ) -> List[HexStr]: ...
 
+    @functools.singledispatchmethod
     async def subscribe(
         self, subscriptions: Union[EthSubscription[Any], Sequence[EthSubscription[Any]]]
     ) -> Union[HexStr, List[HexStr]]:
@@ -149,28 +151,30 @@ async def subscribe(
         :type subscriptions: Union[EthSubscription, Sequence[EthSubscription]]
         :return:
         """
-        if isinstance(subscriptions, EthSubscription):
-            subscriptions.manager = self
-            self._validate_and_normalize_label(subscriptions)
-            sub_id = await self._w3.eth._subscribe(*subscriptions.subscription_params)
-            subscriptions._id = sub_id
-            self._add_subscription(subscriptions)
-            self.logger.info(
-                "Successfully subscribed to subscription:\n    label: %s\n    id: %s",
-                subscriptions.label,
-                sub_id,
-            )
-            return sub_id
-        elif isinstance(subscriptions, Sequence):
-            if len(subscriptions) == 0:
-                raise Web3ValueError("No subscriptions provided.")
-
-            sub_ids: List[HexStr] = []
-            for sub in subscriptions:
-                sub_ids.append(await self.subscribe(sub))
-            return sub_ids
         raise Web3TypeError("Expected a Subscription or a sequence of Subscriptions.")
 
+    @subscribe.register(EthSubscription)
+    async def subscribe(self, subscription: EthSubscription[Any]) -> HexStr:
+        subscription.manager = self
+        self._validate_and_normalize_label(subscription)
+        sub_id = await self._w3.eth._subscribe(*subscription.subscription_params)
+        subscription._id = sub_id
+        self._add_subscription(subscription)
+        self.logger.info(
+            "Successfully subscribed to subscription:\n    label: %s\n    id: %s",
+            subscription.label,
+            sub_id,
+        )
+        return sub_id
+
+    @subscribe.register(Sequence)
+    async def subscribe(
+        self, subscriptions: Sequence[EthSubscription[Any]]
+    ) -> List[HexStr]:
+        if len(subscriptions) == 0:
+            raise Web3ValueError("No subscriptions provided.")
+        return [await sub for sub in map(self.subscribe, subscriptions)]
+
     @overload
     async def unsubscribe(self, subscriptions: EthSubscription[Any]) -> bool: ...
 

faster_web3/providers/persistent/websocket.py

@@ -76,9 +76,7 @@ def __init__(
         self.use_text_frames: Final = use_text_frames
         self._ws: Optional[WebSocketClientProtocol] = None
 
-        if not any(
-            map(endpoint.startswith, VALID_WEBSOCKET_URI_PREFIXES)
-        ):
+        if not any(map(endpoint.startswith, VALID_WEBSOCKET_URI_PREFIXES)):
             raise Web3ValidationError(
                 "WebSocket endpoint uri must begin with 'ws://' or 'wss://': "
                 f"{self.endpoint_uri}"