tidy up identifiers that are typically but not always uuid4s

Signed-off-by: sklump <[email protected]>
openwallet-foundation · Oct 8, 2019 · de8e833 · de8e833
1 parent f9f70ec
commit de8e833
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/aries_cloudagent/messaging/connections/models/connection_record.py b/aries_cloudagent/messaging/connections/models/connection_record.py
@@ -13,7 +13,7 @@
 
 from ...models.base_record import BaseRecord, BaseRecordSchema
 from ...util import time_now
-from ...valid import INDY_DID, INDY_RAW_PUBLIC_KEY, UUID4
+from ...valid import INDY_DID, INDY_RAW_PUBLIC_KEY, UUIDFour
 
 from ..messages.connection_invitation import ConnectionInvitation
 from ..messages.connection_request import ConnectionRequest
@@ -380,7 +380,7 @@ class Meta:
     connection_id = fields.Str(
         required=False,
         description="Connection identifier",
-        **UUID4
+        example=UUIDFour.EXAMPLE,
     )
     my_did = fields.Str(
         required=False,
@@ -405,7 +405,7 @@ class Meta:
     inbound_connection_id = fields.Str(
         required=False,
         description="Inbound routing connection id to use",
-        **UUID4
+        example=UUIDFour.EXAMPLE,
     )
     initiator = fields.Str(
         required=False,
@@ -421,7 +421,7 @@ class Meta:
     request_id = fields.Str(
         required=False,
         description="Connection request identifier",
-        **UUID4
+        example=UUIDFour.EXAMPLE,
     )
     routing_state = fields.Str(
         required=False,

diff --git a/aries_cloudagent/messaging/decorators/transport_decorator.py b/aries_cloudagent/messaging/decorators/transport_decorator.py
@@ -8,7 +8,7 @@
 from marshmallow.validate import OneOf
 
 from ..models.base import BaseModel, BaseModelSchema
-from ..valid import UUID4
+from ..valid import UUIDFour
 
 
 class TransportDecorator(BaseModel):
@@ -57,7 +57,7 @@ class Meta:
     return_route_thread = fields.Str(
         required=False,
         description="Identifier for thread for which to enable return routing",
-        example=UUID4["example"],
+        example=UUIDFour.EXAMPLE,
     )
     queued_message_count = fields.Int(
         required=False,

diff --git a/aries_cloudagent/messaging/present_proof/v1_0/models/presentation_exchange.py b/aries_cloudagent/messaging/present_proof/v1_0/models/presentation_exchange.py
@@ -4,7 +4,7 @@
 from marshmallow.validate import OneOf
 
 from ....models.base_record import BaseRecord, BaseRecordSchema
-from ....valid import UUID4
+from ....valid import UUIDFour
 
 
 class V10PresentationExchange(BaseRecord):
@@ -102,17 +102,17 @@ class Meta:
     presentation_exchange_id = fields.Str(
         required=False,
         description="Presentation exchange identifier",
-        **UUID4
+        example=UUIDFour.EXAMPLE,  # typically a UUID4 but not necessarily
     )
     connection_id = fields.Str(
         required=False,
         description="Connection identifier",
-        **UUID4
+        example=UUIDFour.EXAMPLE,  # typically a UUID4 but not necessarily
     )
     thread_id = fields.Str(
         required=False,
         description="Thread identifier",
-        **UUID4
+        example=UUIDFour.EXAMPLE,  # typically a UUID4 but not necessarily
     )
     initiator = fields.Str(
         required=False,