Revert presentation request metadata and restrictions changes

Signed-off-by: jamshale <[email protected]>
openwallet-foundation · Dec 18, 2024 · 5920e8f · 5920e8f
1 parent 3581b01
commit 5920e8f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/acapy_agent/anoncreds/models/presentation_request.py b/acapy_agent/anoncreds/models/presentation_request.py
@@ -47,7 +47,7 @@ class AnoncredsPresentationReqPredSpecSchema(OpenAPISchema):
         fields.Dict(
             keys=fields.Str(
                 validate=validate.Regexp(
-                    "^schema_id|schema_issuer_id|schema_name|schema_version|issuer_id|"
+                    "^schema_id|schema_issuer_did|schema_name|schema_version|issuer_did|"
                     "cred_def_id|attr::.+::value$"
                 ),
                 metadata={"example": "cred_def_id"},
@@ -58,8 +58,8 @@ class AnoncredsPresentationReqPredSpecSchema(OpenAPISchema):
         metadata={
             "description": (
                 "If present, credential must satisfy one of given restrictions: specify"
-                " schema_id, schema_issuer_id, schema_name, schema_version,"
-                " issuer_id, cred_def_id, and/or attr::<attribute-name>::value where"
+                " schema_id, schema_issuer_did, schema_name, schema_version,"
+                " issuer_did, cred_def_id, and/or attr::<attribute-name>::value where"
                 " <attribute-name> represents a credential attribute name"
             )
         },
@@ -113,7 +113,7 @@ class AnoncredsPresentationReqAttrSpecSchema(OpenAPISchema):
         fields.Dict(
             keys=fields.Str(
                 validate=validate.Regexp(
-                    "^schema_id|schema_issuer_id|schema_name|schema_version|issuer_id|"
+                    "^schema_id|schema_issuer_did|schema_name|schema_version|issuer_did|"
                     "cred_def_id|attr::.+::value$"
                 ),
                 metadata={"example": "cred_def_id"},
@@ -124,8 +124,8 @@ class AnoncredsPresentationReqAttrSpecSchema(OpenAPISchema):
         metadata={
             "description": (
                 "If present, credential must satisfy one of given restrictions: specify"
-                " schema_id, schema_issuer_id, schema_name, schema_version,"
-                " issuer_id, cred_def_id, and/or attr::<attribute-name>::value where"
+                " schema_id, schema_issuer_did, schema_name, schema_version,"
+                " issuer_did, cred_def_id, and/or attr::<attribute-name>::value where"
                 " <attribute-name> represents a credential attribute name"
             )
         },

diff --git a/acapy_agent/protocols/present_proof/v2_0/tests/test_manager_anoncreds.py b/acapy_agent/protocols/present_proof/v2_0/tests/test_manager_anoncreds.py
@@ -2117,7 +2117,7 @@ async def test_receive_pres_bait_and_switch_pred(self):
             "name": "highScore",
             "p_type": ">=",
             "p_value": 1000000,
-            "restrictions": [{"issuer_id": "FFFFFFFFFFFFFFFFFFFFFF"}],  # fake issuer
+            "restrictions": [{"issuer_did": "FFFFFFFFFFFFFFFFFFFFFF"}],  # fake issuer
             "non_revoked": {"from": NOW, "to": NOW},
         }
         pres_proposal = V20PresProposal(