PR feedback

libp2p/security/insecure_security.py

@@ -4,16 +4,16 @@ from libp2p.security.secure_conn_interface import ISecureConn
 from typing import TYPE_CHECKING, Dict, Any, cast
 
 if TYPE_CHECKING:
-    from .secure_conn_interface import ISecureConn
     from libp2p.network.connection.raw_connection_interface import IRawConnection
     from libp2p.peer.id import ID
+    from .secure_conn_interface import ISecureConn
     from .typing import TSecurityDetails
 
 
 class InsecureTransport(ISecureTransport):
-    transport_id: int
+    transport_id: str
 
-    def __init__(self, transport_id: int) -> None:
+    def __init__(self, transport_id: str) -> None:
         self.transport_id = transport_id
 
     async def secure_inbound(self, conn: "IRawConnection") -> ISecureConn:
@@ -41,16 +41,16 @@ class InsecureConn(ISecureConn):
     conn: "IRawConnection"
     details: "TSecurityDetails"
 
-    def __init__(self, conn: "IRawConnection", conn_id: int) -> None:
+    def __init__(self, conn: "IRawConnection", conn_id: str) -> None:
         self.conn = conn
         self.details = cast("TSecurityDetails", {})
         self.details["id"] = conn_id
 
-    def get_conn(self) -> "ISecureConn":
+    def get_conn(self) -> "IRawConnection":
         """
         :return: connection object that has been made secure
         """
-        return cast("ISecureConn", self.conn)
+        return self.conn
 
     def get_security_details(self) -> "TSecurityDetails":
         """

libp2p/security/secure_conn_interface.py

@@ -3,6 +3,7 @@ from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
+    from libp2p.network.connection.raw_connection_interface import IRawConnection
     from .typing import TSecurityDetails
 
 # pylint: disable=W0105
@@ -17,9 +18,9 @@ Relevant go repo: https://github.com/libp2p/go-conn-security/blob/master/interfa
 
 class ISecureConn(ABC):
     @abstractmethod
-    def get_conn(self) -> "ISecureConn":
+    def get_conn(self) -> "IRawConnection":
         """
-        :return: connection object that has been made secure
+        :return: the underlying raw connection
         """
 
     @abstractmethod

libp2p/security/simple_security.py

@@ -67,11 +67,11 @@ class SimpleSecureConn(ISecureConn):
         self.details = cast("TSecurityDetails", {})
         self.details["key_phrase"] = key_phrase
 
-    def get_conn(self) -> "ISecureConn":
+    def get_conn(self) -> "IRawConnection":
         """
         :return: connection object that has been made secure
         """
-        return cast("ISecureConn", self.conn)
+        return self.conn
 
     def get_security_details(self) -> "TSecurityDetails":
         """

libp2p/security/typing.py

@@ -1,4 +1,4 @@
 from typing import TypeVar, Dict, Any, NewType
 
 
-TSecurityDetails = NewType("TSecurityDetails", Dict[str, Any])
+TSecurityDetails = NewType("TSecurityDetails", Dict[str, str])