Fix: Solve test issues

src/aleph/storage.py

@@ -2,6 +2,7 @@
 Basically manages the IPFS storage.
 """
 import asyncio
+import json
 import logging
 from hashlib import sha256
 from typing import Any, IO, Optional, cast, Final
@@ -83,6 +84,10 @@ async def get_message_content(self, message: PendingMessageDb) -> MessageContent
             error_msg = f"Can't decode JSON: {e}"
             LOGGER.warning(error_msg)
             raise InvalidContent(error_msg)
+        except json.decoder.JSONDecodeError as e:
+            error_msg = f"Can't decode JSON: {e}"
+            LOGGER.warning(error_msg)
+            raise InvalidContent(error_msg)
 
         return MessageContent(
             hash=item_hash,

src/aleph/toolkit/json.py

@@ -28,7 +28,7 @@ def load(fp: IO) -> Any:
 def loads(s: Union[bytes, str]) -> Any:
     try:
         return orjson.loads(s)
-    except:
+    except TypeError as e:
         return json.loads(s)
 
 
@@ -39,5 +39,5 @@ def dump(fp: IO, obj: Any) -> None:
 def dumps(obj: Any) -> bytes:
     try:
         return orjson.dumps(obj)
-    except:
+    except TypeError as e:
         return json.dumps(obj).encode()

tests/toolkit/test_json.py

@@ -30,7 +30,7 @@ def test_reject_nans():
     """
 
     serialized_json = '{"1": 1, "2": 2, "3": NaN}'
-    with pytest.raises(aleph_json.DecodeError):
+    with pytest.raises(json.decoder.JSONDecodeError):
         _ = aleph_json.loads(serialized_json)