change parameter to service_accept and typo fix

Signed-off-by: Shaanjot Gill <gill.shaanjots@gmail.com>

Author: shaangill025

aries_cloudagent/connections/base_manager.py

@@ -228,7 +228,7 @@ async def remove_keys_for_did(self, did: str):
             await storage.delete_all_records(self.RECORD_TYPE_DID_KEY, {"did": did})
 
     async def resolve_invitation(
-        self, did: str, accept: Optional[Sequence[Text]] = None
+        self, did: str, service_accept: Optional[Sequence[Text]] = None
     ):
         """
         Resolve invitation with the DID Resolver.
@@ -243,7 +243,7 @@ async def resolve_invitation(
 
         resolver = self._profile.inject(DIDResolver)
         try:
-            doc_dict: dict = await resolver.resolve(self._profile, did, accept)
+            doc_dict: dict = await resolver.resolve(self._profile, did, service_accept)
             doc: ResolvedDocument = pydid.deserialize_document(doc_dict, strict=True)
         except ResolverError as error:
             raise BaseConnectionManagerError(

aries_cloudagent/core/protocol_registry.py

@@ -95,7 +95,7 @@ def create_msg_types_for_minor_version(self, typesets, version_definition):
             for version_index in range(min_minor_version, curr_minor_version + 1):
                 to_check = f"{str(major_version)}.{str(version_index)}"
                 updated_typeset.update(
-                    self._get_updated_tyoeset_dict(typesets, to_check, updated_typeset)
+                    self._get_updated_typeset_dict(typesets, to_check, updated_typeset)
                 )
         else:
             raise ProtocolDefinitionValidationError(
@@ -104,7 +104,7 @@ def create_msg_types_for_minor_version(self, typesets, version_definition):
             )
         return (updated_typeset,)
 
-    def _get_updated_tyoeset_dict(self, typesets, to_check, updated_typeset) -> dict:
+    def _get_updated_typeset_dict(self, typesets, to_check, updated_typeset) -> dict:
         for typeset in typesets:
             for msg_type_string, module_path in typeset.items():
                 updated_msg_type_string = re.sub(

aries_cloudagent/protocols/out_of_band/v1_0/manager.py

@@ -88,7 +88,7 @@ async def create_invitation(
         attachments: Sequence[Mapping] = None,
         metadata: dict = None,
         mediation_id: str = None,
-        accept: Optional[Sequence[Text]] = None,
+        service_accept: Optional[Sequence[Text]] = None,
         protocol_version: Optional[Text] = None,
     ) -> InvitationRecord:
         """
@@ -108,7 +108,7 @@ async def create_invitation(
             multi_use: set to True to create an invitation for multiple-use connection
             alias: optional alias to apply to connection for later use
             attachments: list of dicts in form of {"id": ..., "type": ...}
-            accept: Optional list of mime types in the order of preference of the sender
+            service_accept: Optional list of mime types in the order of preference of the sender
             that the receiver can use in responding to the message
             protocol_version: OOB protocol version [1.0, 1.1]
 
@@ -233,7 +233,7 @@ async def create_invitation(
                 handshake_protocols=handshake_protocols,
                 requests_attach=message_attachments,
                 services=[f"did:sov:{public_did.did}"],
-                accept=accept if protocol_version != "1.0" else None,
+                service_accept=service_accept if protocol_version != "1.0" else None,
                 version=protocol_version or DEFAULT_VERSION,
             )
 
@@ -332,7 +332,9 @@ async def create_invitation(
             invi_msg.label = my_label or self.profile.settings.get("default_label")
             invi_msg.handshake_protocols = handshake_protocols
             invi_msg.requests_attach = message_attachments
-            invi_msg.accept = accept if protocol_version != "1.0" else None
+            invi_msg.service_accept = (
+                service_accept if protocol_version != "1.0" else None
+            )
             invi_msg.services = [
                 ServiceMessage(
                     _id="#inline",
@@ -426,8 +428,8 @@ async def receive_invitation(
         # Get the single service item
         oob_service_item = invitation.services[0]
 
-        # accept
-        accept = invitation.accept
+        # service_accept
+        service_accept = invitation.service_accept
 
         # Get the DID public did, if any
         public_did = None
@@ -483,7 +485,7 @@ async def receive_invitation(
                 alias=alias,
                 auto_accept=auto_accept,
                 mediation_id=mediation_id,
-                accept=accept,
+                service_accept=service_accept,
             )
             LOGGER.debug(
                 f"Performed handshake with connection {oob_record.connection_id}"
@@ -738,7 +740,7 @@ async def _perform_handshake(
         alias: Optional[str] = None,
         auto_accept: Optional[bool] = None,
         mediation_id: Optional[str] = None,
-        accept: Optional[Sequence[Text]] = None,
+        service_accept: Optional[Sequence[Text]] = None,
     ) -> OobRecord:
         invitation = oob_record.invitation
 
@@ -767,7 +769,7 @@ async def _perform_handshake(
             # ED25519 keys
             endpoint, recipient_keys, routing_keys = await self.resolve_invitation(
                 service,
-                accept=accept,
+                service_accept=service_accept,
             )
             service = ServiceMessage.deserialize(
                 {

aries_cloudagent/protocols/out_of_band/v1_0/messages/invitation.py

@@ -123,7 +123,7 @@ def __init__(
         handshake_protocols: Sequence[Text] = None,
         requests_attach: Sequence[AttachDecorator] = None,
         services: Sequence[Union[Service, Text]] = None,
-        accept: Optional[Sequence[Text]] = None,
+        service_accept: Optional[Sequence[Text]] = None,
         version: str = DEFAULT_VERSION,
         msg_type: Optional[Text] = None,
         **kwargs,
@@ -147,7 +147,7 @@ def __init__(
             self._type = msg_type
         else:
             self._type = self.get_updated_msg_type(version)
-        self.accept = accept
+        self.service_accept = service_accept
 
     @classmethod
     def wrap_message(cls, message: dict) -> AttachDecorator:
@@ -222,7 +222,7 @@ class Meta:
         ),
         required=False,
     )
-    accept = fields.List(
+    service_accept = fields.List(
         fields.Str(),
         example=["didcomm/aip1", "didcomm/aip2;env=rfc19"],
         description=("List of mime type in order of preference"),

aries_cloudagent/protocols/out_of_band/v1_0/routes.py

@@ -165,7 +165,7 @@ async def invitation_create(request: web.BaseRequest):
     body = await request.json() if request.body_exists else {}
     attachments = body.get("attachments")
     handshake_protocols = body.get("handshake_protocols", [])
-    accept = body.get("accept")
+    service_accept = body.get("accept")
     use_public_did = body.get("use_public_did", False)
     metadata = body.get("metadata")
     my_label = body.get("my_label")
@@ -191,7 +191,7 @@ async def invitation_create(request: web.BaseRequest):
             metadata=metadata,
             alias=alias,
             mediation_id=mediation_id,
-            accept=accept,
+            service_accept=service_accept,
             protocol_version=protocol_version,
         )
     except (StorageNotFoundError, ValidationError, OutOfBandManagerError) as e:

aries_cloudagent/protocols/out_of_band/v1_0/tests/test_manager.py

@@ -791,7 +791,7 @@ async def test_create_invitation_peer_did(self):
                     public=False,
                     hs_protos=[test_module.HSProto.RFC23],
                     multi_use=False,
-                    accept=["didcomm/aip1", "didcomm/aip2;env=rfc19"],
+                    service_accept=["didcomm/aip1", "didcomm/aip2;env=rfc19"],
                 )
 
                 assert invi_rec._invitation.ser[
@@ -1514,7 +1514,7 @@ async def test_receive_invitation_handshake_reuse_failed(self):
                 alias="alias",
                 auto_accept=True,
                 mediation_id="mediation_id",
-                accept=None,
+                service_accept=None,
             )
 
             assert mock_oob.state == OobRecord.STATE_DONE

aries_cloudagent/protocols/out_of_band/v1_0/tests/test_routes.py

@@ -57,7 +57,7 @@ async def test_invitation_create(self):
                 metadata=body["metadata"],
                 alias=None,
                 mediation_id=None,
-                accept=None,
+                service_accept=None,
                 protocol_version=None,
             )
             mock_json_response.assert_called_once_with({"abc": "123"})
@@ -98,7 +98,7 @@ async def test_invitation_create_with_accept(self):
                 metadata=body["metadata"],
                 alias=None,
                 mediation_id=None,
-                accept=["didcomm/aip1", "didcomm/aip2;env=rfc19"],
+                service_accept=["didcomm/aip1", "didcomm/aip2;env=rfc19"],
                 protocol_version=None,
             )
             mock_json_response.assert_called_once_with({"abc": "123"})

aries_cloudagent/resolver/base.py

@@ -136,7 +136,7 @@ async def resolve(
         self,
         profile: Profile,
         did: Union[str, DID],
-        accept: Optional[Sequence[Text]] = None,
+        service_accept: Optional[Sequence[Text]] = None,
     ) -> dict:
         """Resolve a DID using this resolver."""
         if isinstance(did, DID):
@@ -148,10 +148,13 @@ async def resolve(
                 f"{self.__class__.__name__} does not support DID method for: {did}"
             )
 
-        return await self._resolve(profile, did, accept)
+        return await self._resolve(profile, did, service_accept)
 
     @abstractmethod
     async def _resolve(
-        self, profile: Profile, did: str, accept: Optional[Sequence[Text]] = None
+        self,
+        profile: Profile,
+        did: str,
+        service_accept: Optional[Sequence[Text]] = None,
     ) -> dict:
         """Resolve a DID using this resolver."""

aries_cloudagent/resolver/default/indy.py

@@ -69,7 +69,7 @@ def add_services(
         builder: DIDDocumentBuilder,
         endpoints: Optional[dict],
         recipient_key: VerificationMethod = None,
-        accept: Optional[Sequence[Text]] = None,
+        service_accept: Optional[Sequence[Text]] = None,
     ):
         """Add services."""
         if not endpoints:
@@ -103,7 +103,9 @@ def add_services(
                     priority=1,
                     routing_keys=routing_keys,
                     recipient_keys=[recipient_key.id],
-                    accept=(accept if accept else ["didcomm/aip2;env=rfc19"]),
+                    accept=(
+                        service_accept if service_accept else ["didcomm/aip2;env=rfc19"]
+                    ),
                 )
 
             if self.SERVICE_TYPE_DIDCOMM in types:
@@ -113,7 +115,7 @@ def add_services(
                     service_endpoint=endpoint,
                     recipient_keys=[recipient_key.id],
                     routing_keys=routing_keys,
-                    # CHECKME accept=(accept if accept else ["didcomm/v2"]),
+                    # CHECKME accept=(service_accept if service_accept else ["didcomm/v2"]),
                     accept=["didcomm/v2"],
                 )
                 builder.context.append(self.CONTEXT_DIDCOMM_V2)
@@ -131,7 +133,10 @@ def add_services(
                 )
 
     async def _resolve(
-        self, profile: Profile, did: str, accept: Optional[Sequence[Text]] = None
+        self,
+        profile: Profile,
+        did: str,
+        service_accept: Optional[Sequence[Text]] = None,
     ) -> dict:
         """Resolve an indy DID."""
         multitenant_mgr = profile.inject_or(BaseMultitenantManager)
@@ -162,7 +167,7 @@ async def _resolve(
         )
         builder.authentication.reference(vmethod.id)
         builder.assertion_method.reference(vmethod.id)
-        self.add_services(builder, endpoints, vmethod, accept)
+        self.add_services(builder, endpoints, vmethod, service_accept)
 
         result = builder.build()
         return result.serialize()

aries_cloudagent/resolver/default/key.py

@@ -29,7 +29,10 @@ def supported_did_regex(self) -> Pattern:
         return DIDKeyType.PATTERN
 
     async def _resolve(
-        self, profile: Profile, did: str, accept: Optional[Sequence[Text]] = None
+        self,
+        profile: Profile,
+        did: str,
+        service_accept: Optional[Sequence[Text]] = None,
     ) -> dict:
         """Resolve a Key DID."""
         try: