From 869d2db84796896cb5df20f83d91117ed45518cd Mon Sep 17 00:00:00 2001
From: Stuckinaboot <aspyn@seas.upenn.edu>
Date: Tue, 30 Oct 2018 00:03:19 +0100
Subject: [PATCH] Update exception type

---
 peer/peerdata.py               |  8 ++++++--
 peer/peerdata_interface.py     |  3 ++-
 peer/peermetadata_interface.py |  5 +++--
 peer/peerstore.py              | 10 +++++++---
 peer/peerstore_interface.py    |  4 ++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/peer/peerdata.py b/peer/peerdata.py
index 40676e8..9a700d9 100644
--- a/peer/peerdata.py
+++ b/peer/peerdata.py
@@ -27,6 +27,10 @@ class PeerData(IPeerData):
 
     def get_metadata(self, key):
         if key in self.metadata:
-            return self.metadata[key], None
+            return self.metadata[key]
         else:
-            raise Exception("key not found")
+            raise PeerDataError("key not found")
+
+class PeerDataError(KeyError):
+    """Raised when a key is not found in peer metadata"""
+    pass
diff --git a/peer/peerdata_interface.py b/peer/peerdata_interface.py
index 1d5fa8c..dd4432d 100644
--- a/peer/peerdata_interface.py
+++ b/peer/peerdata_interface.py
@@ -35,6 +35,7 @@ class IPeerData(ABC):
     """
     :param key: key in KV pair
     :param val: val to associate with key
+    :raise Exception: unsuccesful put
     """
     def put_metadata(self, key, val):
         pass
@@ -42,7 +43,7 @@ class IPeerData(ABC):
     """
     :param key: key in KV pair
     :return: val for key
-    :raise Exception: key not found exception
+    :raise Exception: key not found
     """
     def get_metadata(self, key):
         pass
diff --git a/peer/peermetadata_interface.py b/peer/peermetadata_interface.py
index 6fda82f..818ee5e 100644
--- a/peer/peermetadata_interface.py
+++ b/peer/peermetadata_interface.py
@@ -10,7 +10,8 @@ class IPeerMetadata(ABC):
         """
         :param peer_id: peer ID to lookup key for
         :param key: key to look up
-        :return: value at key for given peer, error
+        :return: value at key for given peer
+        :raise Exception: peer ID not found
         """
         pass
 
@@ -20,7 +21,7 @@ class IPeerMetadata(ABC):
         :param peer_id: peer ID to lookup key for
         :param key: key to associate with peer
         :param val: value to associated with key
-        :return: error
+        :raise Exception: unsuccessful put
         """
         pass
         
\ No newline at end of file
diff --git a/peer/peerstore.py b/peer/peerstore.py
index 2ddcf11..fbefb20 100644
--- a/peer/peerstore.py
+++ b/peer/peerstore.py
@@ -32,7 +32,7 @@ class PeerStore(IPeerStore):
         if peer_id in self.peer_map:
             return self.peer_map[peer_id].get_protocols()
         else:
-            raise Exception("peer ID not found")
+            raise PeerStoreError("peer ID not found")
 
     def add_protocols(self, peer_id, protocols):
         peer = self.__create_or_get_peer(peer_id)
@@ -46,7 +46,7 @@ class PeerStore(IPeerStore):
             val = self.peer_map[peer_id].get_metadata(key)
             return val
         else:
-            raise Exception("peer ID not found")
+            raise PeerStoreError("peer ID not found")
 
     def put(self, peer_id, key, val):
         # <<?>>
@@ -66,7 +66,7 @@ class PeerStore(IPeerStore):
         if peer_id in self.peer_map:
             return self.peer_map[peer_id].get_addrs()
         else:
-            raise Exception("peer ID not found")
+            raise PeerStoreError("peer ID not found")
 
     def clear_addrs(self, peer_id):
         # Only clear addresses if the peer is in peer map
@@ -81,3 +81,7 @@ class PeerStore(IPeerStore):
             if len(self.peer_map[key].get_addrs()) >= 1:
                 output.append(key)
         return output
+
+class PeerStoreError(KeyError):
+    """Raised when peer ID is not found in peer store"""
+    pass
diff --git a/peer/peerstore_interface.py b/peer/peerstore_interface.py
index 8615ce0..240083a 100644
--- a/peer/peerstore_interface.py
+++ b/peer/peerstore_interface.py
@@ -30,7 +30,7 @@ class IPeerStore(ABC, IAddrBook, IPeerMetadata):
         """
         :param peer_id: peer ID to add protocols for
         :param protocols: protocols to add
-        :raise Exception: peer ID not found exception
+        :raise Exception: peer ID not found
         """
         pass
 
@@ -39,7 +39,7 @@ class IPeerStore(ABC, IAddrBook, IPeerMetadata):
         """
         :param peer_id: peer ID to set protocols for
         :param protocols: protocols to set
-        :raise Exception: peer ID not found exception
+        :raise Exception: peer ID not found
         """
         pass