Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions app/models/connections.py

This file was deleted.

10 changes: 5 additions & 5 deletions app/models/verifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
from typing import Optional, Union

from aries_cloudcontroller import (
AnoncredsPresentationRequest as AcaPyAnoncredsPresentationRequest,
AnonCredsPresentationRequest as AcaPyAnonCredsPresentationRequest,
)
from aries_cloudcontroller import (
AnoncredsPresSpec,
AnonCredsPresSpec,
DIFPresSpec,
DIFProofRequest,
IndyNonRevocationInterval,
Expand All @@ -25,7 +25,7 @@ class ProofRequestType(str, Enum):
ANONCREDS: str = "anoncreds"


class AnoncredsPresentationRequest(AcaPyAnoncredsPresentationRequest):
class AnonCredsPresentationRequest(AcaPyAnonCredsPresentationRequest):
name: str = Field(default="Proof", description="Proof request name")
version: str = Field(default="1.0", description="Proof request version")

Expand All @@ -39,7 +39,7 @@ class ProofRequestBase(BaseModel):
type: ProofRequestType = ProofRequestType.INDY
indy_proof_request: Optional[IndyProofRequest] = None
dif_proof_request: Optional[DIFProofRequest] = None
anoncreds_proof_request: Optional[AnoncredsPresentationRequest] = None
anoncreds_proof_request: Optional[AnonCredsPresentationRequest] = None

@model_validator(mode="before")
@classmethod
Expand Down Expand Up @@ -114,7 +114,7 @@ class AcceptProofRequest(ProofId, SaveExchangeRecordField):
type: ProofRequestType = ProofRequestType.INDY
indy_presentation_spec: Optional[IndyPresSpec] = None
dif_presentation_spec: Optional[DIFPresSpec] = None
anoncreds_presentation_spec: Optional[AnoncredsPresSpec] = None
anoncreds_presentation_spec: Optional[AnonCredsPresSpec] = None

@model_validator(mode="after")
def validate_specs(self) -> "AcceptProofRequest":
Expand Down
2 changes: 1 addition & 1 deletion app/routes/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ async def get_connections( # pylint: disable=R0913,R0917
offset: int - The offset to start retrieving records from
descending: bool - Whether to return results in descending order. Results are ordered by record created time.
alias: str
connection_protocol: Protocol: "connections/1.0", "didexchange/1.0"
connection_protocol: Protocol: "didexchange/1.0", "didexchange/1.1"
invitation_key: str
invitation_msg_id: str
my_did: str
Expand Down
1 change: 0 additions & 1 deletion app/routes/oob.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ async def create_oob_invitation(
handshake_protocols = (
[
"https://didcomm.org/didexchange/1.0",
"https://didcomm.org/connections/1.0",
]
if body.create_connection
else None
Expand Down
4 changes: 2 additions & 2 deletions app/services/issuer/acapy_issuer_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
V20CredExFree,
V20CredExRecord,
V20CredFilter,
V20CredFilterAnoncreds,
V20CredFilterAnonCreds,
V20CredFilterIndy,
V20CredOfferConnFreeRequest,
V20CredPreview,
Expand Down Expand Up @@ -123,7 +123,7 @@ def _get_credential_preview_and_filter(
)
anon_model = handle_model_with_validation(
logger=bound_logger,
model_class=V20CredFilterAnoncreds,
model_class=V20CredFilterAnonCreds,
cred_def_id=credential.anoncreds_credential_detail.credential_definition_id,
issuer_id=strip_qualified_did_sov(
credential.anoncreds_credential_detail.issuer_did
Expand Down
16 changes: 8 additions & 8 deletions app/services/revocation_registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
AcaPyClient,
ClearPendingRevocationsRequest,
CredRevRecordResult,
CredRevRecordResultSchemaAnoncreds,
CredRevRecordResultSchemaAnonCreds,
IssuerCredRevRecord,
IssuerRevRegRecord,
PublishRevocations,
PublishRevocationsOptions,
PublishRevocationsResultSchemaAnoncreds,
PublishRevocationsSchemaAnoncreds,
PublishRevocationsResultSchemaAnonCreds,
PublishRevocationsSchemaAnonCreds,
RevokeRequest,
RevokeRequestSchemaAnoncreds,
RevokeRequestSchemaAnonCreds,
RevRegResult,
TxnOrPublishRevocationsResult,
)
Expand Down Expand Up @@ -107,7 +107,7 @@ async def revoke_credential(
if wallet_type == "askar-anoncreds":
request_body = handle_model_with_validation(
logger=bound_logger,
model_class=RevokeRequestSchemaAnoncreds,
model_class=RevokeRequestSchemaAnonCreds,
cred_ex_id=strip_protocol_prefix(credential_exchange_id),
publish=auto_publish_to_ledger,
)
Expand Down Expand Up @@ -227,7 +227,7 @@ async def publish_pending_revocations(
try:
if wallet_type == "askar-anoncreds":
acapy_call = controller.anoncreds_revocation.publish_revocations
body = PublishRevocationsSchemaAnoncreds(
body = PublishRevocationsSchemaAnonCreds(
rrid2crid=revocation_registry_credential_map,
options=PublishRevocationsOptions(create_transaction_for_endorser=True),
)
Expand Down Expand Up @@ -258,7 +258,7 @@ async def publish_pending_revocations(
[txn.transaction_id for txn in result.txn],
)
return result
elif isinstance(result, PublishRevocationsResultSchemaAnoncreds):
elif isinstance(result, PublishRevocationsResultSchemaAnonCreds):
bound_logger.info(
"Successfully published pending AnonCreds revocations: {}.", result
)
Expand Down Expand Up @@ -373,7 +373,7 @@ async def get_credential_revocation_record(
) from e

if not isinstance(
result, (CredRevRecordResultSchemaAnoncreds, CredRevRecordResult)
result, (CredRevRecordResultSchemaAnonCreds, CredRevRecordResult)
):
bound_logger.error(
"Unexpected type returned from get_revocation_status: `{}`.", result
Expand Down
Loading
Loading