PR Feedback

Author: pipermerriam

p2p/peer.py

@@ -567,6 +567,10 @@ def subscription_msg_types(self) -> Set[Type[protocol.Command]]:
 
         The base command class `p2p.protocol.Command` can be used to enable
         **all** command types.
+
+        .. note: This API only applies to sub-protocol commands.  Base protocol
+        commands are handled exclusively at the peer level and cannot be
+        consumed with this API.
         """
         pass
 
@@ -610,25 +614,22 @@ def add_msg(self, msg: 'PEER_MSG_TYPE') -> bool:
         peer, cmd, _ = msg
 
         if not self.is_subscription_command(type(cmd)):
-            if hasattr(self, 'logger'):
-                self.logger.trace(  # type: ignore
-                    "Discarding %s msg from %s; not subscribed to msg type; "
-                    "subscriptions: %s",
-                    cmd, peer, self.subscription_msg_types,
-                )
+            self.logger.trace(  # type: ignore
+                "Discarding %s msg from %s; not subscribed to msg type; "
+                "subscriptions: %s",
+                cmd, peer, self.subscription_msg_types,
+            )
             return False
 
         try:
-            if hasattr(self, 'logger'):
-                self.logger.trace(  # type: ignore
-                    "Adding %s msg from %s to queue; queue_size=%d", cmd, peer, self.queue_size)
+            self.logger.trace(  # type: ignore
+                "Adding %s msg from %s to queue; queue_size=%d", cmd, peer, self.queue_size)
             self.msg_queue.put_nowait(msg)
             return True
         except asyncio.queues.QueueFull:
-            if hasattr(self, 'logger'):
-                self.logger.warn(  # type: ignore
-                    "%s msg queue is full; discarding %s msg from %s",
-                    self.__class__.__name__, cmd, peer)
+            self.logger.warn(  # type: ignore
+                "%s msg queue is full; discarding %s msg from %s",
+                self.__class__.__name__, cmd, peer)
             return False
 
     @contextlib.contextmanager

tests/p2p/test_peer_subscriber.py

@@ -1,4 +1,5 @@
 import asyncio
+import logging
 
 import pytest
 
@@ -13,12 +14,17 @@
 )
 
 
+logger = logging.getLogger('testing.p2p.PeerSubscriber')
+
+
 class HeadersSubscriber(PeerSubscriber):
+    logger = logger
     msg_queue_maxsize = 10
     subscription_msg_types = {GetBlockHeaders}
 
 
 class AllSubscriber(PeerSubscriber):
+    logger = logger
     msg_queue_maxsize = 10
     subscription_msg_types = {Command}