fix unit tests

Signed-off-by: DaevMithran <[email protected]>

Author: DaevMithran

cheqd/cheqd/anoncreds/tests/conftest.py

@@ -20,8 +20,8 @@ def mock_profile():
 @pytest.fixture
 def mock_resolver():
     mock_resolver = AsyncMock()
-    mock_resolver.resolve_resource.return_value = MagicMock()
-    mock_resolver.resolve_resource.return_value.resource = {
+    mock_resolver.dereference_with_metadata.return_value = MagicMock()
+    mock_resolver.dereference_with_metadata.return_value.resource = {
         "attrNames": "MOCK_ATTR_NAMES",
         "name": "MOCK_NAME",
         "version": "MOCK_VERSION",
@@ -34,7 +34,7 @@ def mock_resolver():
         "revocationList": [0, 1, 0],
         "currentAccumulator": "MOCK_ACCUMULATOR",
     }
-    mock_resolver.resolve_resource.return_value.metadata = {
+    mock_resolver.dereference_with_metadata.return_value.metadata = {
         "MOCK_METADATA_KEY": "MOCK_METADATA_VALUE"
     }
 

cheqd/cheqd/anoncreds/tests/test_registry.py

@@ -123,7 +123,7 @@ async def test_get_schema(mock_profile, mock_resolver):
         assert result.schema.version == "MOCK_VERSION"
         assert result.schema_metadata == {"MOCK_METADATA_KEY": "MOCK_METADATA_VALUE"}
         assert result.resolution_metadata == {}
-        mock_resolver.resolve_resource.assert_called_once_with(schema_id)
+        mock_resolver.dereference_with_metadata.assert_called_once_with(schema_id)
 
 
 async def test_register_schema(
@@ -132,7 +132,7 @@ async def test_register_schema(
     # Arrange
     with (
         patch(
-            "cheqd.cheqd.anoncreds.registry.CheqdDIDResolver.resolve_resource",
+            "cheqd.cheqd.anoncreds.registry.CheqdDIDResolver.dereference_with_metadata",
             return_value=None,
         ),
         patch(
@@ -177,7 +177,7 @@ async def test_register_schema_update(
     # Arrange
     with (
         patch(
-            "cheqd.cheqd.anoncreds.registry.CheqdDIDResolver.resolve_resource",
+            "cheqd.cheqd.anoncreds.registry.CheqdDIDResolver.dereference_with_metadata",
             return_value={},
         ),
         patch(
@@ -226,7 +226,7 @@ async def test_register_schema_registration_error(mock_profile, mock_schema):
     # Act
     with (
         patch(
-            "cheqd.cheqd.anoncreds.registry.CheqdDIDResolver.resolve_resource",
+            "cheqd.cheqd.anoncreds.registry.CheqdDIDResolver.dereference_with_metadata",
             return_value=None,
         ),
         patch(
@@ -273,7 +273,7 @@ async def test_get_credential_definition(mock_profile, mock_resolver):
             "MOCK_METADATA_KEY": "MOCK_METADATA_VALUE"
         }
         assert result.resolution_metadata == {}
-        mock_resolver.resolve_resource.assert_called_once_with(credential_definition_id)
+        mock_resolver.dereference_with_metadata.assert_called_once_with(credential_definition_id)
 
 
 async def test_register_credential_definition(
@@ -285,7 +285,7 @@ async def test_register_credential_definition(
     # Arrange
     with (
         patch(
-            "cheqd.cheqd.anoncreds.registry.CheqdDIDResolver.resolve_resource",
+            "cheqd.cheqd.anoncreds.registry.CheqdDIDResolver.dereference_with_metadata",
             return_value=None,
         ),
         patch(
@@ -362,7 +362,7 @@ async def test_get_revocation_registry_definition(mock_profile, mock_resolver):
             "MOCK_METADATA_KEY": "MOCK_METADATA_VALUE"
         }
         assert result.resolution_metadata == {}
-        mock_resolver.resolve_resource.assert_called_once_with("PART0/PART1/PART2")
+        mock_resolver.dereference_with_metadata.assert_called_once_with("PART0/PART1/PART2")
 
 
 async def test_register_revocation_registry_definition(
@@ -378,7 +378,7 @@ async def test_register_revocation_registry_definition(
             return_value=mock_get_credential_definition_result,
         ),
         patch(
-            "cheqd.cheqd.anoncreds.registry.CheqdDIDResolver.resolve_resource",
+            "cheqd.cheqd.anoncreds.registry.CheqdDIDResolver.dereference_with_metadata",
             return_value=None,
         ),
         patch(
@@ -456,7 +456,7 @@ async def test_get_revocation_list(mock_profile, mock_resolver, mock_rev_reg_def
             "MOCK_METADATA_KEY": "MOCK_METADATA_VALUE"
         }
 
-        mock_resolver.resolve_resource.assert_called_once()
+        mock_resolver.dereference_with_metadata.assert_called_once()
 
 
 async def test_register_revocation_status_list(
@@ -543,7 +543,7 @@ async def test_get_schema_info_by_id(mock_resolver, mock_profile):
         assert result.issuer_id == "PART0"
         assert result.name == "MOCK_NAME"
         assert result.version == "MOCK_VERSION"
-        mock_resolver.resolve_resource.assert_called_once_with(schema_id)
+        mock_resolver.dereference_with_metadata.assert_called_once_with(schema_id)
 
 
 @patch("cheqd.cheqd.did.manager.DIDRegistrar")

cheqd/cheqd/resolver/resolver.py

@@ -14,7 +14,7 @@
 )
 from aiohttp import ClientSession
 from pydid import DIDDocument
-from pydantic import BaseModel
+from pydantic import BaseModel, ValidationError
 
 from ..validation import CheqdDID
 
@@ -103,15 +103,18 @@ async def resolve(
         did_doc_resp = resolver_resp.get("didDocument")
         did_doc_metadata = resolver_resp.get("didDocumentMetadata")
 
-        did_doc = DIDDocument.from_json(json.dumps(did_doc_resp))
-        result = did_doc.serialize()
-        # Check if 'deactivated' field is present in didDocumentMetadata
-        if (
-                did_doc_metadata
-                and did_doc_metadata.get("deactivated") is True
-        ):
-            result["deactivated"] = True
-        return result
+        try:
+            did_doc = DIDDocument.from_json(json.dumps(did_doc_resp))
+            result = did_doc.serialize()
+            # Check if 'deactivated' field is present in didDocumentMetadata
+            if (
+                    did_doc_metadata
+                    and did_doc_metadata.get("deactivated") is True
+            ):
+                result["deactivated"] = True
+            return result
+        except Exception as err:
+            raise ResolverError("Response was incorrectly formatted") from err
 
     async def dereference_with_metadata(
             self,
@@ -125,9 +128,11 @@ async def dereference_with_metadata(
             did_url,
             [f"Accept: {DID_URL_DEREFERENCING_HEADER}"]
         )
-
-        validated_resp = DIDUrlDereferencingResult(**result)
-        return DIDLinkedResourceWithMetadata(
-            resource=validated_resp.contentStream,
-            metadata=validated_resp.contentMetadata
-        )
+        try:
+            validated_resp = DIDUrlDereferencingResult(**result)
+            return DIDLinkedResourceWithMetadata(
+                resource=validated_resp.contentStream,
+                metadata=validated_resp.contentMetadata
+            )
+        except ValidationError:
+            raise ResolverError("DidUrlDereferencing result was incorrectly formatted")

cheqd/cheqd/resolver/tests/test_resolver.py

@@ -25,7 +25,7 @@ async def test_resolve(resolver, resolve_url, did):
         mocked.get(resolve_url, status=200, payload=mock_response)
 
         # Act
-        did_doc = await resolver._resolve(None, did)
+        did_doc = await resolver.resolve(None, did)
 
         # Assert
         assert did_doc == {
@@ -46,7 +46,7 @@ async def test_resolve_deactivated(resolver, resolve_url, did):
         mocked.get(resolve_url, status=200, payload=mock_response)
 
         # Act
-        did_doc = await resolver._resolve(None, did)
+        did_doc = await resolver.resolve(None, did)
 
         # Assert
         assert did_doc == {
@@ -69,7 +69,7 @@ async def test_resolve_incorrectly_formatted(resolver, resolve_url, did):
 
         # Act
         with pytest.raises(Exception) as excinfo:
-            await resolver._resolve(None, did)
+            await resolver.resolve(None, did)
 
         # Assert
         assert str(excinfo.value) == "Response was incorrectly formatted"
@@ -84,7 +84,7 @@ async def test_resolve_path_not_found(resolver, resolve_url, did):
 
         # Act
         with pytest.raises(Exception) as excinfo:
-            await resolver._resolve(None, did)
+            await resolver.resolve(None, did)
 
         # Assert
         assert str(excinfo.value) == f"No document found for {did}"
@@ -94,24 +94,19 @@ async def test_resolve_path_not_found(resolver, resolve_url, did):
 @pytest.mark.asyncio
 async def test_resolve_resource(resolver, resolve_resource_params):
     # Arrange
-    mock_response = {"MOCK_KEY": "MOCK_VALUE"}
-    mock_metadata_response = {
-        "contentStream": {
-            "linkedResourceMetadata": [{"MOCK_METADATA_KEY": "MOCK_METADATA_VALUE"}]
-        }
+    mock_response = {
+        "contentStream": {"MOCK_KEY": "MOCK_VALUE"},
+        "contentMetadata": {"MOCK_METADATA_KEY": "MOCK_METADATA_VALUE"}
     }
     did_resource, resolve_resource_url, resolve_resource_metadata_url = (
         resolve_resource_params
     )
 
     with aioresponses() as mocked:
         mocked.get(resolve_resource_url, status=200, payload=mock_response)
-        mocked.get(
-            resolve_resource_metadata_url, status=200, payload=mock_metadata_response
-        )
 
         # Act
-        response = await resolver.resolve_resource(did_resource)
+        response = await resolver.dereference_with_metadata(None, did_resource)
 
         # Assert
         assert response is not None
@@ -129,7 +124,7 @@ async def test_resolve_resource_incorrectly_formatted(resolver, resolve_resource
 
         # Act
         with pytest.raises(Exception) as excinfo:
-            await resolver.resolve_resource(did_resource)
+            await resolver.dereference_with_metadata(None, did_resource)
 
         # Assert
         assert str(excinfo.value) == "Response was incorrectly formatted"
@@ -146,10 +141,10 @@ async def test_resolve_resource_path_not_found(resolver, resolve_resource_params
 
         # Act
         with pytest.raises(Exception) as excinfo:
-            await resolver.resolve_resource(did_resource)
+            await resolver.dereference_with_metadata(None, did_resource)
 
         # Assert
-        assert str(excinfo.value) == f"No resource found for {did_resource}"
+        assert str(excinfo.value) == f"No document found for {did_resource}"
         assert isinstance(excinfo.value, DIDNotFound)
 
 
@@ -158,43 +153,21 @@ async def test_resolve_resource_metadata_incorrectly_formatted(
     resolver, resolve_resource_params
 ):
     # Arrange
-    mock_response = {"MOCK_KEY": "MOCK_VALUE"}
+    mock_response = {
+        "contentStream": {"MOCK_KEY": "MOCK_VALUE"},
+        "contentMetadata": "MOCK_VALUE"
+    }
     did_resource, resolve_resource_url, resolve_resource_metadata_url = (
         resolve_resource_params
     )
 
     with aioresponses() as mocked:
         mocked.get(resolve_resource_url, status=200, payload=mock_response)
-        mocked.get(
-            resolve_resource_metadata_url, status=200, body="Invalid JSON Response"
-        )
 
         # Act
         with pytest.raises(Exception) as excinfo:
-            await resolver.resolve_resource(did_resource)
+            await resolver.dereference_with_metadata(None, did_resource)
 
         # Assert
-        assert str(excinfo.value) == "Metadata response was incorrectly formatted"
+        assert str(excinfo.value) == "DidUrlDereferencing result was incorrectly formatted"
         assert isinstance(excinfo.value, ResolverError)
-
-
-@pytest.mark.asyncio
-async def test_resolve_resource_metadata_path_not_found(
-    resolver, resolve_resource_params
-):
-    # Arrange
-    mock_response = {"MOCK_KEY": "MOCK_VALUE"}
-    did_resource, resolve_resource_url, resolve_resource_metadata_url = (
-        resolve_resource_params
-    )
-    with aioresponses() as mocked:
-        mocked.get(resolve_resource_url, status=200, payload=mock_response)
-        mocked.get(resolve_resource_metadata_url, status=404)
-
-        # Act
-        with pytest.raises(Exception) as excinfo:
-            await resolver.resolve_resource(did_resource)
-
-        # Assert
-        assert str(excinfo.value) == f"No metadata found for {did_resource}"
-        assert isinstance(excinfo.value, DIDNotFound)