exception.py: differentiate between bridge and farmer errors.

use new BridgeError class and make StorjBridgeApiError an alias of it.
use new FarmerError class and make StorjFarmerError an alias of it.

Author: steenzout

storj/exception.py

@@ -2,13 +2,65 @@
 """Storj exception module."""
 
 
-class StorjBridgeApiError(Exception):
-    """Generic Storj exception."""
-    pass
+class BridgeError(RuntimeError):
+    """Storj bridge runtime exception.
 
+    Attributes:
+        message (str): error message.
+    """
+
+    def __init__(self, code='', message=''):
+        super(RuntimeError, self).__init__()
+
+        self.code = code
+        self.message = message
+
+
+class FarmerError(RuntimeError):
+    """Storj farmer runtime exception.
+
+    Attributes:
+        code (int): error code.
+        message (str): error message.
+    """
 
-class StorjFarmerError(Exception):
-    """Storj Farmer Exception"""
     SUPPLIED_TOKEN_NOT_ACCEPTED = 10002
     CALCULATED_HASH_NOT_MATCH_EXPECTED_RESULT = 10003
-    pass
+
+    def __init__(self, code, message=''):
+        super(RuntimeError, self).__init__()
+
+        self.code = code
+        self.message = message
+
+    def __str__(self):
+        """Returns a string representation of this error.
+
+        Returns:
+            str: string representation of this error.
+        """
+        return '[%s] %s' % (self.code, self.message)
+
+
+class SuppliedTokenNotAcceptedError(FarmerError):
+    """"""
+
+    CODE = 10002
+
+    def __init__(self):
+        super(SuppliedTokenNotAcceptedError, self).__init__(
+            code=SuppliedTokenNotAcceptedError.CODE)
+
+
+class HashMismatchError(FarmerError):
+    """"""
+
+    CODE = 10003
+
+    def __init__(self):
+        super(HashMismatchError, self).__init__(
+            code=HashMismatchError.CODE)
+
+
+StorjBridgeApiError = BridgeError
+StorjFarmerError = FarmerError

tests/unit/http_test.py

@@ -129,7 +129,7 @@ def test_bucket_get_error(self):
 
         self.mock_request.side_effect = mock_error
 
-        with pytest.raises(exception.StorjBridgeApiError):
+        with pytest.raises(exception.BridgeError):
             self.client.bucket_get('error')
 
         self.mock_request.assert_called_once_with(