From ea4fd8e81f7b29473d762b36f1bf07efd5ed015b Mon Sep 17 00:00:00 2001
From: Alex Haynes <alhaynes@seas.upenn.edu>
Date: Sun, 5 May 2019 14:32:41 -0400
Subject: [PATCH] requested changes

---
 libp2p/__init__.py                              | 2 --
 libp2p/host/basic_host.py                       | 2 +-
 libp2p/routing/kademlia/kademlia_peer_router.py | 8 +++-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/libp2p/__init__.py b/libp2p/__init__.py
index 9d779f9..2772bed 100644
--- a/libp2p/__init__.py
+++ b/libp2p/__init__.py
@@ -109,8 +109,6 @@ async def new_node(
             muxer_opt=muxer_opt, sec_opt=sec_opt,
             peerstore_opt=peerstore_opt, disc_opt=disc_opt)
 
-    swarm_opt.add_router(disc_opt)
-
     # TODO enable support for other host type
     # TODO routing unimplemented
     host = BasicHost(swarm_opt)
diff --git a/libp2p/host/basic_host.py b/libp2p/host/basic_host.py
index b85c413..40292df 100644
--- a/libp2p/host/basic_host.py
+++ b/libp2p/host/basic_host.py
@@ -13,8 +13,8 @@ class BasicHost(IHost):
     # default options constructor
     def __init__(self, network, router=None):
         self._network = network
-        self.peerstore = self._network.peerstore
         self._router = router
+        self.peerstore = self._network.peerstore
 
     def get_id(self):
         """
diff --git a/libp2p/routing/kademlia/kademlia_peer_router.py b/libp2p/routing/kademlia/kademlia_peer_router.py
index 00de28a..45c43c8 100644
--- a/libp2p/routing/kademlia/kademlia_peer_router.py
+++ b/libp2p/routing/kademlia/kademlia_peer_router.py
@@ -12,9 +12,9 @@ class KadmeliaPeerRouter(IPeerRouting):
 
     async def find_peer(self, peer_id):
         """
-        Find specific Peer
-        FindPeer searches for a peer with given peer_id, returns a peer.PeerInfo
-        with relevant addresses.
+        Find a specific peer
+        :param peer_id: peer to search for
+        :return: KadPeerInfo of specified peer
         """
         # switching peer_id to xor_id used by kademlia as node_id
         xor_id = peer_id.get_xor_id()
@@ -24,12 +24,10 @@ class KadmeliaPeerRouter(IPeerRouting):
 def decode_peerinfo(encoded):
     if isinstance(encoded, bytes):
         encoded = encoded.decode()
-    print(encoded)
     try:
         lines = ast.literal_eval(encoded)
     except SyntaxError:
         return None
-    # xor_id = lines[0]
     ip = lines[1] # pylint: disable=invalid-name
     port = lines[2]
     peer_id = lines[3]