Merge pull request openwallet-foundation#1921 from sake/statuslist-fix-main

Leave credentialStatus element in the LD credential

Author: swcurran

aries_cloudagent/protocols/issue_credential/v2_0/formats/ld_proof/handler.py

@@ -503,7 +503,7 @@ async def receive_credential(
 
         # Remove values from cred that are not part of detail
         cred_dict.pop("proof")
-        credential_status = cred_dict.pop("credentialStatus", None)
+        credential_status = cred_dict.get("credentialStatus", None)
         detail_status = detail.options.credential_status
 
         if cred_dict != detail_dict["credential"]:

aries_cloudagent/protocols/issue_credential/v2_0/formats/ld_proof/tests/test_handler.py

@@ -770,13 +770,14 @@ async def test_receive_credential_x_credential_status_ne(self):
 
     async def test_receive_credential_x_credential_status_ne_both_set(self):
         detail = deepcopy(LD_PROOF_VC_DETAIL)
+        status_entry = {"type": "SomeRandomType"}
 
-        # Set credential status so it's only set on the detail
-        # not the issued credential
+        # Set credential status in both request and reference credential
         detail["options"]["credentialStatus"] = {"type": "CredentialStatusType"}
+        detail["credential"]["credentialStatus"] = deepcopy(status_entry)
 
         vc = deepcopy(LD_PROOF_VC)
-        vc["credentialStatus"] = {"type": "SomeRandomType"}
+        vc["credentialStatus"] = deepcopy(status_entry)
 
         cred_issue = V20CredIssue(
             formats=[