More changes from comments on PR #3554:

- Test `full_transactions` property of `PendingTxSubscription`
- Abstract `SubscriptionContainer` to its own file

Author: fselmo

tests/core/subscriptions/test_subscriptions.py

@@ -28,6 +28,7 @@ def test_pending_tx_subscription_properties_default(handler):
     )
     assert pending_tx_subscription._handler is handler
     assert pending_tx_subscription.label == "pending tx label"
+    assert pending_tx_subscription.full_transactions is False
     assert pending_tx_subscription.subscription_params == (
         "newPendingTransactions",
         False,
@@ -40,6 +41,7 @@ def test_pending_tx_subscription_properties_full_transactions(handler):
     )
     assert pending_tx_subscription._handler is handler
     assert pending_tx_subscription.label == "pending tx label"
+    assert pending_tx_subscription.full_transactions is True
     assert pending_tx_subscription.subscription_params == (
         "newPendingTransactions",
         True,

web3/providers/persistent/subscription_container.py

@@ -0,0 +1,56 @@
+from typing import (
+    Any,
+    Dict,
+    Iterator,
+    List,
+    Optional,
+)
+
+from eth_typing import (
+    HexStr,
+)
+
+from web3.utils import (
+    EthSubscription,
+)
+
+
+class SubscriptionContainer:
+    def __init__(self) -> None:
+        self.subscriptions: List[EthSubscription[Any]] = []
+        self.subscriptions_by_id: Dict[HexStr, EthSubscription[Any]] = {}
+        self.subscriptions_by_label: Dict[str, EthSubscription[Any]] = {}
+
+    def __len__(self) -> int:
+        return len(self.subscriptions)
+
+    def __iter__(self) -> Iterator[EthSubscription[Any]]:
+        return iter(self.subscriptions)
+
+    def add_subscription(self, subscription: EthSubscription[Any]) -> None:
+        self.subscriptions.append(subscription)
+        self.subscriptions_by_id[subscription.id] = subscription
+        self.subscriptions_by_label[subscription.label] = subscription
+
+    def remove_subscription(self, subscription: EthSubscription[Any]) -> None:
+        self.subscriptions.remove(subscription)
+        self.subscriptions_by_id.pop(subscription.id)
+        self.subscriptions_by_label.pop(subscription.label)
+
+    def get_by_id(self, sub_id: HexStr) -> EthSubscription[Any]:
+        return self.subscriptions_by_id.get(sub_id)
+
+    def get_by_label(self, label: str) -> EthSubscription[Any]:
+        return self.subscriptions_by_label.get(label)
+
+    @property
+    def handler_subscriptions(self) -> List[EthSubscription[Any]]:
+        return [sub for sub in self.subscriptions if sub._handler is not None]
+
+    def get_handler_subscription_by_id(
+        self, sub_id: HexStr
+    ) -> Optional[EthSubscription[Any]]:
+        sub = self.get_by_id(sub_id)
+        if sub and sub._handler:
+            return sub
+        return None

web3/providers/persistent/subscription_manager.py

@@ -3,10 +3,7 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Dict,
-    Iterator,
     List,
-    Optional,
     Sequence,
     Union,
     cast,
@@ -23,6 +20,9 @@
     Web3TypeError,
     Web3ValueError,
 )
+from web3.providers.persistent.subscription_container import (
+    SubscriptionContainer,
+)
 from web3.types import (
     FormattedEthSubscriptionResponse,
     RPCResponse,
@@ -40,47 +40,6 @@
     )
 
 
-class SubscriptionContainer:
-    def __init__(self) -> None:
-        self.subscriptions: List[EthSubscription[Any]] = []
-        self.subscriptions_by_id: Dict[HexStr, EthSubscription[Any]] = {}
-        self.subscriptions_by_label: Dict[str, EthSubscription[Any]] = {}
-
-    def __len__(self) -> int:
-        return len(self.subscriptions)
-
-    def __iter__(self) -> Iterator[EthSubscription[Any]]:
-        return iter(self.subscriptions)
-
-    def add_subscription(self, subscription: EthSubscription[Any]) -> None:
-        self.subscriptions.append(subscription)
-        self.subscriptions_by_id[subscription.id] = subscription
-        self.subscriptions_by_label[subscription.label] = subscription
-
-    def remove_subscription(self, subscription: EthSubscription[Any]) -> None:
-        self.subscriptions.remove(subscription)
-        self.subscriptions_by_id.pop(subscription.id)
-        self.subscriptions_by_label.pop(subscription.label)
-
-    def get_by_id(self, sub_id: HexStr) -> EthSubscription[Any]:
-        return self.subscriptions_by_id.get(sub_id)
-
-    def get_by_label(self, label: str) -> EthSubscription[Any]:
-        return self.subscriptions_by_label.get(label)
-
-    @property
-    def handler_subscriptions(self) -> List[EthSubscription[Any]]:
-        return [sub for sub in self.subscriptions if sub._handler is not None]
-
-    def get_handler_subscription_by_id(
-        self, sub_id: HexStr
-    ) -> Optional[EthSubscription[Any]]:
-        sub = self.get_by_id(sub_id)
-        if sub and sub._handler:
-            return sub
-        return None
-
-
 class SubscriptionManager:
     """
     The ``SubscriptionManager`` is responsible for subscribing, unsubscribing, and