Allow Ping, Pong, Disconnect Messages snappy compressible

Author: Bhargavasomu

p2p/p2p_proto.py

@@ -95,10 +95,10 @@ class P2PProtocol(Protocol):
     _commands = [Hello, Ping, Pong, Disconnect]
     cmd_length = 16
 
-    def __init__(self, peer: 'BasePeer') -> None:
+    def __init__(self, peer: 'BasePeer', snappy_support: bool) -> None:
         # For the base protocol the cmd_id_offset is always 0.
         # For the base protocol snappy compression should be disabled
-        super().__init__(peer, cmd_id_offset=0, snappy_support=False)
+        super().__init__(peer, cmd_id_offset=0, snappy_support=snappy_support)
 
     def send_handshake(self) -> None:
         # TODO: move import out once this is in the trinity codebase

p2p/peer.py

@@ -211,7 +211,9 @@ def __init__(self,
         # Networking reader and writer objects for communication
         self.reader = connection.reader
         self.writer = connection.writer
-        self.base_protocol = P2PProtocol(self)
+        # Initially while doing the handshake, the base protocol shouldn't support
+        # snappy compression
+        self.base_protocol = P2PProtocol(self, snappy_support=False)
 
         # Flag indicating whether the connection this peer represents was
         # established from a dial-out or dial-in (True: dial-in, False:
@@ -493,6 +495,12 @@ async def process_p2p_handshake(
         # based on other peer's p2p protocol version
         snappy_support = msg['version'] >= SNAPPY_PROTOCOL_VERSION
 
+        if snappy_support:
+            # Now update the base protocol to support snappy compression
+            # This is needed so that Trinity is compatible with parity since
+            # parity sends Ping even after Handshake
+            self.base_protocol = P2PProtocol(self, snappy_support=snappy_support)
+
         remote_capabilities = msg['capabilities']
         try:
             self.sub_proto = self.select_sub_protocol(remote_capabilities, snappy_support)

tests/core/p2p-proto/test_peer.py

@@ -54,7 +54,7 @@ async def test_les_handshake():
     )
 )
 def test_sub_protocol_selection(snappy_support):
-    peer = ProtoMatchingPeer([LESProtocol, LESProtocolV2])
+    peer = ProtoMatchingPeer([LESProtocol, LESProtocolV2], snappy_support)
 
     proto = peer.select_sub_protocol([
         (LESProtocol.name, LESProtocol.version),
@@ -102,6 +102,6 @@ class LESProtocolV3(LESProtocol):
 
 class ProtoMatchingPeer(LESPeer):
 
-    def __init__(self, supported_sub_protocols):
+    def __init__(self, supported_sub_protocols, snappy_support):
         self._supported_sub_protocols = supported_sub_protocols
-        self.base_protocol = P2PProtocol(self)
+        self.base_protocol = P2PProtocol(self, snappy_support)