From e7d2681fc08292afd24adaf0d783419ac3660e11 Mon Sep 17 00:00:00 2001
From: Alex Stokes <r.alex.stokes@gmail.com>
Date: Tue, 13 Aug 2019 15:19:22 -0700
Subject: [PATCH] Move base implementations into `BaseSession`

---
 libp2p/security/base_session.py       | 23 ++++++++++++++++++++---
 libp2p/security/insecure/transport.py | 14 +-------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/libp2p/security/base_session.py b/libp2p/security/base_session.py
index 5b23ba64..b319ea9f 100644
--- a/libp2p/security/base_session.py
+++ b/libp2p/security/base_session.py
@@ -15,18 +15,35 @@ class BaseSession(ISecureConn, IRawConnection):
     ) -> None:
         self.local_peer = transport.local_peer
         self.local_private_key = transport.local_private_key
-        self.insecure_conn = conn
+        self.conn = conn
         self.remote_peer_id = peer_id
         self.remote_permanent_pubkey = b""
 
     # TODO clean up how this is passed around?
     @property
     def initiator(self) -> bool:
-        return self.insecure_conn.initiator
+        return self.conn.initiator
 
     # TODO clean up how this is passed around?
     def next_stream_id(self) -> int:
-        return self.insecure_conn.next_stream_id()
+        return self.conn.next_stream_id()
+
+    @property
+    def writer(self):
+        return self.conn.writer
+
+    @property
+    def reader(self):
+        return self.conn.reader
+
+    async def write(self, data: bytes) -> None:
+        await self.conn.write(data)
+
+    async def read(self) -> bytes:
+        return await self.conn.read()
+
+    def close(self) -> None:
+        self.conn.close()
 
     def get_local_peer(self) -> ID:
         return self.local_peer
diff --git a/libp2p/security/insecure/transport.py b/libp2p/security/insecure/transport.py
index 6ce6a4ef..2d8a5a83 100644
--- a/libp2p/security/insecure/transport.py
+++ b/libp2p/security/insecure/transport.py
@@ -6,19 +6,7 @@ from libp2p.security.secure_conn_interface import ISecureConn
 
 
 class InsecureSession(BaseSession):
-    @property
-    def writer(self):
-        return self.insecure_conn.writer
-
-    @property
-    def reader(self):
-        return self.insecure_conn.reader
-
-    async def write(self, data: bytes) -> None:
-        await self.insecure_conn.write(data)
-
-    async def read(self) -> bytes:
-        return await self.insecure_conn.read()
+    pass
 
 
 class InsecureTransport(BaseSecureTransport):