Solve file content not found (#812)

* Fix: Solve issue with not rejecting messages that it's content doesn't exist on IPFS.

* Fix: Solve failing test.

Author: nesitor

src/aleph/services/ipfs/service.py

@@ -10,7 +10,7 @@
 
 from aleph.services.ipfs.common import make_ipfs_client
 from aleph.services.utils import get_IP
-from aleph.types.message_status import FileUnavailable
+from aleph.types.message_status import FileContentUnavailable, FileUnavailable
 from aleph.utils import run_in_executor
 
 LOGGER = logging.getLogger(__name__)
@@ -113,8 +113,9 @@ async def get_ipfs_size(
                 await asyncio.sleep(0.5)
                 continue
             except asyncio.TimeoutError:
-                result = None
-                await asyncio.sleep(0.5)
+                raise FileContentUnavailable(
+                    "Could not retrieve IPFS content at this time"
+                )
             except (
                 concurrent.futures.CancelledError,
                 aiohttp.client_exceptions.ClientConnectorError,

src/aleph/types/message_status.py

@@ -169,6 +169,16 @@ def __init__(self, file_hash: str):
         super().__init__(f"File not found: {file_hash}")
 
 
+class FileContentNotFoundException(RetryMessageException):
+    """
+    A file required to process the message could not be found, locally and/or
+    on the network.
+    """
+
+    def __init__(self, file_hash: str):
+        super().__init__(f"File content not found: {file_hash}")
+
+
 class MessageContentUnavailable(FileNotFoundException):
     """
     The message content is not available at the moment (storage/IPFS item types).
@@ -185,6 +195,14 @@ class FileUnavailable(FileNotFoundException):
     error_code = ErrorCode.FILE_UNAVAILABLE
 
 
+class FileContentUnavailable(FileContentNotFoundException):
+    """
+    A file pointed to by the message is not available at the moment.
+    """
+
+    error_code = ErrorCode.FILE_UNAVAILABLE
+
+
 class NoAmendTarget(InvalidMessageException):
     """
     A POST with type = amend does not specify a value in the ref field.

tests/services/test_ipfs_service.py

@@ -5,6 +5,7 @@
 import pytest
 
 from aleph.services.ipfs.service import IpfsService
+from aleph.types.message_status import FileContentUnavailable
 
 
 @pytest.mark.asyncio
@@ -178,14 +179,15 @@ async def test_get_ipfs_size_timeout_error():
 
     service = IpfsService(ipfs_client=ipfs_client)
 
-    # Mock asyncio.sleep to not actually sleep during test
-    with patch("asyncio.sleep", new_callable=AsyncMock):
-        # Execute
-        result = await service.get_ipfs_size("test_hash")
+    with pytest.raises(FileContentUnavailable):
+        # Mock asyncio.sleep to not actually sleep during test
+        with patch("asyncio.sleep", new_callable=AsyncMock):
+            # Execute
+            result = await service.get_ipfs_size("test_hash")
 
-    # Assert
-    assert result is None
-    ipfs_client.dag.get.assert_called_once_with("test_hash")
+        # Assert
+        assert result is None
+        ipfs_client.dag.get.assert_called_once_with("test_hash")
 
 
 @pytest.mark.asyncio