diff --git a/acapy_agent/revocation/routes.py b/acapy_agent/revocation/routes.py index d082fc3a07..4899e729a8 100644 --- a/acapy_agent/revocation/routes.py +++ b/acapy_agent/revocation/routes.py @@ -32,12 +32,12 @@ from ..messaging.models.openapi import OpenAPISchema from ..messaging.responder import BaseResponder from ..messaging.valid import ( - ANONCREDS_CRED_DEF_ID_EXAMPLE, - ANONCREDS_CRED_DEF_ID_VALIDATE, + INDY_CRED_DEF_ID_EXAMPLE, + INDY_CRED_DEF_ID_VALIDATE, INDY_CRED_REV_ID_EXAMPLE, INDY_CRED_REV_ID_VALIDATE, - ANONCREDS_REV_REG_ID_EXAMPLE, - ANONCREDS_REV_REG_ID_VALIDATE, + INDY_REV_REG_ID_EXAMPLE, + INDY_REV_REG_ID_VALIDATE, INDY_REV_REG_SIZE_EXAMPLE, INDY_REV_REG_SIZE_VALIDATE, UUID4_EXAMPLE, @@ -86,10 +86,10 @@ class RevRegCreateRequestSchema(OpenAPISchema): """Request schema for revocation registry creation request.""" credential_definition_id = fields.Str( - validate=ANONCREDS_CRED_DEF_ID_VALIDATE, + validate=INDY_CRED_DEF_ID_VALIDATE, metadata={ "description": "Credential definition identifier", - "example": ANONCREDS_CRED_DEF_ID_EXAMPLE, + "example": INDY_CRED_DEF_ID_EXAMPLE, }, ) max_cred_num = fields.Int( @@ -143,10 +143,10 @@ def validate_fields(self, data, **kwargs): rev_reg_id = fields.Str( required=False, - validate=ANONCREDS_REV_REG_ID_VALIDATE, + validate=INDY_REV_REG_ID_VALIDATE, metadata={ "description": "Revocation registry identifier", - "example": ANONCREDS_REV_REG_ID_EXAMPLE, + "example": INDY_REV_REG_ID_EXAMPLE, }, ) cred_rev_id = fields.Str( @@ -182,18 +182,18 @@ def validate_fields(self, data, **kwargs): rev_reg_id = fields.Str( required=False, - validate=ANONCREDS_REV_REG_ID_VALIDATE, + validate=INDY_REV_REG_ID_VALIDATE, metadata={ "description": "Revocation registry identifier", - "example": ANONCREDS_REV_REG_ID_EXAMPLE, + "example": INDY_REV_REG_ID_EXAMPLE, }, ) cred_def_id = fields.Str( required=False, - validate=ANONCREDS_CRED_DEF_ID_VALIDATE, + validate=INDY_CRED_DEF_ID_VALIDATE, metadata={ "description": "Credential definition identifier", - "example": ANONCREDS_CRED_DEF_ID_EXAMPLE, + "example": INDY_CRED_DEF_ID_EXAMPLE, }, ) @@ -270,7 +270,7 @@ class PublishRevocationsSchema(OpenAPISchema): rrid2crid = fields.Dict( required=False, - keys=fields.Str(metadata={"example": ANONCREDS_REV_REG_ID_EXAMPLE}), + keys=fields.Str(metadata={"example": INDY_REV_REG_ID_EXAMPLE}), values=fields.List( fields.Str( validate=INDY_CRED_REV_ID_VALIDATE, @@ -303,7 +303,7 @@ class ClearPendingRevocationsRequestSchema(OpenAPISchema): purge = fields.Dict( required=False, - keys=fields.Str(metadata={"example": ANONCREDS_REV_REG_ID_EXAMPLE}), + keys=fields.Str(metadata={"example": INDY_REV_REG_ID_EXAMPLE}), values=fields.List( fields.Str( validate=INDY_CRED_REV_ID_VALIDATE, @@ -383,10 +383,10 @@ class RevRegsCreatedSchema(OpenAPISchema): rev_reg_ids = fields.List( fields.Str( - validate=ANONCREDS_REV_REG_ID_VALIDATE, + validate=INDY_REV_REG_ID_VALIDATE, metadata={ "description": "Revocation registry identifiers", - "example": ANONCREDS_REV_REG_ID_EXAMPLE, + "example": INDY_REV_REG_ID_EXAMPLE, }, ) ) @@ -401,7 +401,7 @@ class RevRegUpdateTailsFileUriSchema(OpenAPISchema): "description": "Public URI to the tails file", "example": ( "http://192.168.56.133:6543/revocation/registry/" - f"{ANONCREDS_REV_REG_ID_EXAMPLE}/tails-file" + f"{INDY_REV_REG_ID_EXAMPLE}/tails-file" ), }, ) @@ -412,10 +412,10 @@ class RevRegsCreatedQueryStringSchema(OpenAPISchema): cred_def_id = fields.Str( required=False, - validate=ANONCREDS_CRED_DEF_ID_VALIDATE, + validate=INDY_CRED_DEF_ID_VALIDATE, metadata={ "description": "Credential definition identifier", - "example": ANONCREDS_CRED_DEF_ID_EXAMPLE, + "example": INDY_CRED_DEF_ID_EXAMPLE, }, ) state = fields.Str( @@ -452,10 +452,10 @@ class RevRegIdMatchInfoSchema(OpenAPISchema): rev_reg_id = fields.Str( required=True, - validate=ANONCREDS_REV_REG_ID_VALIDATE, + validate=INDY_REV_REG_ID_VALIDATE, metadata={ "description": "Revocation Registry identifier", - "example": ANONCREDS_REV_REG_ID_EXAMPLE, + "example": INDY_REV_REG_ID_EXAMPLE, }, ) @@ -465,10 +465,10 @@ class RevocationCredDefIdMatchInfoSchema(OpenAPISchema): cred_def_id = fields.Str( required=True, - validate=ANONCREDS_CRED_DEF_ID_VALIDATE, + validate=INDY_CRED_DEF_ID_VALIDATE, metadata={ "description": "Credential definition identifier", - "example": ANONCREDS_CRED_DEF_ID_EXAMPLE, + "example": INDY_CRED_DEF_ID_EXAMPLE, }, ) diff --git a/acapy_agent/revocation/tests/test_routes.py b/acapy_agent/revocation/tests/test_routes.py index f0e5f6b054..97f33c5cc8 100644 --- a/acapy_agent/revocation/tests/test_routes.py +++ b/acapy_agent/revocation/tests/test_routes.py @@ -74,7 +74,7 @@ async def test_validate_cred_rev_rec_qs_and_revoke_req(self): ): req.validate_fields( { - "rev_reg_id": test_module.ANONCREDS_REV_REG_ID_EXAMPLE, + "rev_reg_id": test_module.INDY_REV_REG_ID_EXAMPLE, "cred_rev_id": test_module.INDY_CRED_REV_ID_EXAMPLE, } ) @@ -82,15 +82,13 @@ async def test_validate_cred_rev_rec_qs_and_revoke_req(self): with self.assertRaises(test_module.ValidationError): req.validate_fields({}) with self.assertRaises(test_module.ValidationError): - req.validate_fields( - {"rev_reg_id": test_module.ANONCREDS_REV_REG_ID_EXAMPLE} - ) + req.validate_fields({"rev_reg_id": test_module.INDY_REV_REG_ID_EXAMPLE}) with self.assertRaises(test_module.ValidationError): req.validate_fields({"cred_rev_id": test_module.INDY_CRED_REV_ID_EXAMPLE}) with self.assertRaises(test_module.ValidationError): req.validate_fields( { - "rev_reg_id": test_module.ANONCREDS_REV_REG_ID_EXAMPLE, + "rev_reg_id": test_module.INDY_REV_REG_ID_EXAMPLE, "cred_ex_id": test_module.UUID4_EXAMPLE, } ) @@ -104,7 +102,7 @@ async def test_validate_cred_rev_rec_qs_and_revoke_req(self): with self.assertRaises(test_module.ValidationError): req.validate_fields( { - "rev_reg_id": test_module.ANONCREDS_REV_REG_ID_EXAMPLE, + "rev_reg_id": test_module.INDY_REV_REG_ID_EXAMPLE, "cred_rev_id": test_module.INDY_CRED_REV_ID_EXAMPLE, "cred_ex_id": test_module.UUID4_EXAMPLE, }