Skip to content

Commit

Permalink
Use W3c instead of capitalized W3C in python wrapper
Browse files Browse the repository at this point in the history
Signed-off-by: artem.ivanov <artem.ivanov@dsr-corporation.com>
  • Loading branch information
Artemkaaas committed Dec 11, 2023
1 parent c436949 commit 9f26c7d
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 57 deletions.
12 changes: 6 additions & 6 deletions wrappers/python/anoncreds/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
RevocationStatusList,
RevocationRegistryDefinition,
RevocationRegistryDefinitionPrivate,
W3CCredentialOffer,
W3CCredentialRequest,
W3CCredential,
W3CPresentation,
W3cCredentialOffer,
W3cCredentialRequest,
W3cCredential,
W3cPresentation,
)

__all__ = (
Expand Down Expand Up @@ -52,6 +52,6 @@
"RevocationRegistryDefinition",
"RevocationRegistryDefinitionPrivate",
"Schema",
"W3CCredential",
"W3CPresentation"
"W3cCredential",
"W3cPresentation"
)
78 changes: 39 additions & 39 deletions wrappers/python/anoncreds/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,23 @@ def load(cls, value: Union[dict, str, bytes, memoryview]) -> "CredentialOffer":
)


class W3CCredentialOffer(bindings.AnoncredsObject):
class W3cCredentialOffer(bindings.AnoncredsObject):
@classmethod
def create(
cls,
schema_id: str,
cred_def_id: str,
key_proof: Union[str, KeyCorrectnessProof],
) -> "W3CCredentialOffer":
) -> "W3cCredentialOffer":
if not isinstance(key_proof, bindings.AnoncredsObject):
key_proof = KeyCorrectnessProof.load(key_proof)
return W3CCredentialOffer(
return W3cCredentialOffer(
bindings.create_w3c_credential_offer(schema_id, cred_def_id, key_proof.handle)
)

@classmethod
def load(cls, value: Union[dict, str, bytes, memoryview]) -> "W3CCredentialOffer":
return W3CCredentialOffer(
def load(cls, value: Union[dict, str, bytes, memoryview]) -> "W3cCredentialOffer":
return W3cCredentialOffer(
bindings._object_from_json("anoncreds_credential_offer_from_json", value)
)

Expand Down Expand Up @@ -159,7 +159,7 @@ def load(cls, value: Union[dict, str, bytes, memoryview]) -> "CredentialRequest"



class W3CCredentialRequest(bindings.AnoncredsObject):
class W3cCredentialRequest(bindings.AnoncredsObject):
@classmethod
def create(
cls,
Expand All @@ -168,12 +168,12 @@ def create(
cred_def: Union[str, CredentialDefinition],
link_secret: str,
link_secret_id: str,
cred_offer: Union[str, W3CCredentialOffer],
) -> Tuple["W3CCredentialRequest", "CredentialRequestMetadata"]:
cred_offer: Union[str, W3cCredentialOffer],
) -> Tuple["W3cCredentialRequest", "CredentialRequestMetadata"]:
if not isinstance(cred_def, bindings.AnoncredsObject):
cred_def = CredentialDefinition.load(cred_def)
if not isinstance(cred_offer, bindings.AnoncredsObject):
cred_offer = W3CCredentialOffer.load(cred_offer)
cred_offer = W3cCredentialOffer.load(cred_offer)
cred_def_handle, cred_def_metadata = bindings.create_w3c_credential_request(
entropy,
prover_did,
Expand All @@ -182,13 +182,13 @@ def create(
link_secret_id,
cred_offer.handle,
)
return W3CCredentialRequest(cred_def_handle), CredentialRequestMetadata(
return W3cCredentialRequest(cred_def_handle), CredentialRequestMetadata(
cred_def_metadata
)

@classmethod
def load(cls, value: Union[dict, str, bytes, memoryview]) -> "W3CCredentialRequest":
return W3CCredentialRequest(
def load(cls, value: Union[dict, str, bytes, memoryview]) -> "W3cCredentialRequest":
return W3cCredentialRequest(
bindings._object_from_json("anoncreds_credential_request_from_json", value)
)

Expand Down Expand Up @@ -402,47 +402,47 @@ def rev_reg_index(self) -> Optional[int]:
def to_w3c(
self,
cred_def: Union[str, CredentialDefinition]
) -> "W3CCredential":
) -> "W3cCredential":
if not isinstance(cred_def, bindings.AnoncredsObject):
cred_def = CredentialDefinition.load(cred_def)
return W3CCredential(
return W3cCredential(
bindings.credential_to_w3c(
self.handle,
cred_def.handle,
)
)

@classmethod
def from_w3c(cls, cred: "W3CCredential") -> "Credential":
def from_w3c(cls, cred: "W3cCredential") -> "Credential":
return Credential(
bindings.credential_from_w3c(
cred.handle
)
)


class W3CCredential(bindings.AnoncredsObject):
class W3cCredential(bindings.AnoncredsObject):
GET_ATTR = "anoncreds_w3c_credential_get_attribute"

@classmethod
def create(
cls,
cred_def: Union[str, CredentialDefinition],
cred_def_private: Union[str, CredentialDefinitionPrivate],
cred_offer: Union[str, W3CCredentialOffer],
cred_request: Union[str, W3CCredentialRequest],
cred_offer: Union[str, W3cCredentialOffer],
cred_request: Union[str, W3cCredentialRequest],
attr_raw_values: Mapping[str, str],
revocation_config: Optional["CredentialRevocationConfig"] = None,
encoding: Optional[str] = None,
) -> "W3CCredential":
) -> "W3cCredential":
if not isinstance(cred_def, bindings.AnoncredsObject):
cred_def = CredentialDefinition.load(cred_def)
if not isinstance(cred_def_private, bindings.AnoncredsObject):
cred_def_private = CredentialDefinitionPrivate.load(cred_def_private)
if not isinstance(cred_offer, bindings.AnoncredsObject):
cred_offer = W3CCredentialOffer.load(cred_offer)
cred_offer = W3cCredentialOffer.load(cred_offer)
if not isinstance(cred_request, bindings.AnoncredsObject):
cred_request = W3CCredentialRequest.load(cred_request)
cred_request = W3cCredentialRequest.load(cred_request)
cred = bindings.create_w3c_credential(
cred_def.handle,
cred_def_private.handle,
Expand All @@ -452,22 +452,22 @@ def create(
revocation_config._native if revocation_config else None,
encoding,
)
return W3CCredential(cred)
return W3cCredential(cred)

def process(
self,
cred_req_metadata: Union[str, CredentialRequestMetadata],
link_secret: str,
cred_def: Union[str, CredentialDefinition],
rev_reg_def: Optional[Union[str, "RevocationRegistryDefinition"]] = None,
) -> "W3CCredential":
) -> "W3cCredential":
if not isinstance(cred_req_metadata, bindings.AnoncredsObject):
cred_req_metadata = CredentialRequestMetadata.load(cred_req_metadata)
if not isinstance(cred_def, bindings.AnoncredsObject):
cred_def = CredentialDefinition.load(cred_def)
if rev_reg_def and not isinstance(rev_reg_def, bindings.AnoncredsObject):
rev_reg_def = RevocationRegistryDefinition.load(rev_reg_def)
return W3CCredential(
return W3cCredential(
bindings.process_w3c_credential(
self.handle,
cred_req_metadata.handle,
Expand All @@ -478,7 +478,7 @@ def process(
)

@classmethod
def load(cls, value: Union[dict, str, bytes, memoryview]) -> "W3CCredential":
def load(cls, value: Union[dict, str, bytes, memoryview]) -> "W3cCredential":
return Credential(
bindings._object_from_json("anoncreds_w3c_credential_from_json", value)
)
Expand Down Expand Up @@ -528,13 +528,13 @@ def to_legacy(
return Credential.from_w3c(self)

@classmethod
def from_legacy(cls, cred: "Credential", cred_def: Union[str, CredentialDefinition]) -> "W3CCredential":
def from_legacy(cls, cred: "Credential", cred_def: Union[str, CredentialDefinition]) -> "W3cCredential":
return cred.to_w3c(cred_def)

def add_non_anoncreds_integrity_proof(
self,
proof: Union[str, dict]
) -> "W3CCredential":
) -> "W3cCredential":
if isinstance(proof, dict):
proof = json.dumps(proof)
self.handle = bindings.w3c_credential_add_non_anoncreds_integrity_proof(
Expand All @@ -545,7 +545,7 @@ def add_non_anoncreds_integrity_proof(
def set_id(
self,
id: str
) -> "W3CCredential":
) -> "W3cCredential":
self.handle = bindings.w3c_credential_set_id(
self.handle,
id,
Expand All @@ -554,7 +554,7 @@ def set_id(
def set_subject_id(
self,
id: str
) -> "W3CCredential":
) -> "W3cCredential":
self.handle = bindings.w3c_credential_set_subject_id(
self.handle,
id,
Expand All @@ -563,7 +563,7 @@ def set_subject_id(
def add_context(
self,
context: str
) -> "W3CCredential":
) -> "W3cCredential":
self.handle = bindings.w3c_credential_add_context(
self.handle,
context,
Expand All @@ -572,7 +572,7 @@ def add_context(
def add_type(
self,
type: str
) -> "W3CCredential":
) -> "W3cCredential":
self.handle = bindings.w3c_credential_add_type(
self.handle,
type,
Expand Down Expand Up @@ -600,7 +600,7 @@ def add_self_attested(self, attest: Mapping[str, str]):

def _get_entry(
self,
cred: Union[Credential, W3CCredential],
cred: Union[Credential, W3cCredential],
timestamp: Optional[int] = None,
rev_state: Union[None, str, "CredentialRevocationState"] = None,
):
Expand All @@ -616,7 +616,7 @@ def _get_entry(

def add_attributes(
self,
cred: Union[Credential, W3CCredential],
cred: Union[Credential, W3cCredential],
*referents: Sequence[str],
reveal: bool = True,
timestamp: Optional[int] = None,
Expand All @@ -630,7 +630,7 @@ def add_attributes(

def add_predicates(
self,
cred: Union[Credential, W3CCredential],
cred: Union[Credential, W3cCredential],
*referents: Sequence[str],
timestamp: Optional[int] = None,
rev_state: Union[None, str, "CredentialRevocationState"] = None,
Expand Down Expand Up @@ -788,7 +788,7 @@ def verify(
)


class W3CPresentation(bindings.AnoncredsObject):
class W3cPresentation(bindings.AnoncredsObject):
@classmethod
def create(
cls,
Expand All @@ -797,7 +797,7 @@ def create(
link_secret: str,
schemas: Mapping[str, Union[str, Schema]],
cred_defs: Mapping[str, Union[str, CredentialDefinition]],
) -> "W3CPresentation":
) -> "W3cPresentation":
if not isinstance(pres_req, bindings.AnoncredsObject):
pres_req = PresentationRequest.load(pres_req)
schema_ids = list(schemas.keys())
Expand Down Expand Up @@ -834,7 +834,7 @@ def create(
creds_prove.append(
bindings.CredentialProve.predicate(entry_idx, reft)
)
return W3CPresentation(
return W3cPresentation(
bindings.create_w3c_presentation(
pres_req.handle,
creds,
Expand All @@ -848,8 +848,8 @@ def create(
)

@classmethod
def load(cls, value: Union[dict, str, bytes, memoryview]) -> "W3CPresentation":
return W3CPresentation(
def load(cls, value: Union[dict, str, bytes, memoryview]) -> "W3cPresentation":
return W3cPresentation(
bindings._object_from_json("anoncreds_w3c_presentation_from_json", value)
)

Expand Down
24 changes: 12 additions & 12 deletions wrappers/python/demo/w3c_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
generate_nonce,
create_link_secret,
Credential,
W3CCredential,
W3cCredential,
CredentialDefinition,
W3CCredentialOffer,
W3CCredentialRequest,
W3cCredentialOffer,
W3cCredentialRequest,
CredentialRevocationConfig,
CredentialRevocationState,
PresentationRequest,
Presentation,
W3CPresentation,
W3cPresentation,
PresentCredentials,
RevocationRegistryDefinition,
RevocationStatusList,
Expand Down Expand Up @@ -50,13 +50,13 @@
link_secret = create_link_secret()
link_secret_id = "default"

cred_offer = W3CCredentialOffer.create(schema_id, cred_def_id, cred_def_correctness)
cred_offer = W3cCredentialOffer.create(schema_id, cred_def_id, cred_def_correctness)

cred_request, cred_request_metadata = W3CCredentialRequest.create(
cred_request, cred_request_metadata = W3cCredentialRequest.create(
entropy, None, cred_def_pub, link_secret, link_secret_id, cred_offer
)

issue_cred = W3CCredential.create(
issue_cred = W3cCredential.create(
cred_def_pub,
cred_def_priv,
cred_offer,
Expand All @@ -75,7 +75,7 @@
cred_request_metadata, link_secret, cred_def_pub, rev_reg_def_pub
)

print("W3C Credential")
print("W3c Credential")
print(recv_cred.to_json())

legacy_cred = recv_cred.to_legacy()
Expand All @@ -87,10 +87,10 @@
print(legacy_cred.to_json())

w3c_cred = legacy_cred.to_w3c(cred_def_pub)
print("W3C converted Credential `to_w3c`")
print("W3c converted Credential `to_w3c`")
print(w3c_cred.to_json())

w3c_cred_restored = W3CCredential.from_legacy(legacy_cred, cred_def_pub)
w3c_cred_restored = W3cCredential.from_legacy(legacy_cred, cred_def_pub)
print("W3C restored Credential `from_legacy`")
print(w3c_cred_restored.to_json())

Expand Down Expand Up @@ -175,7 +175,7 @@
rev_state=rev_state,
)

presentation = W3CPresentation.create(
presentation = W3cPresentation.create(
pres_req,
present,
link_secret,
Expand Down Expand Up @@ -271,7 +271,7 @@
recv_cred, "predicate1_referent", timestamp=time_revoke_cred, rev_state=rev_state
)

presentation = W3CPresentation.create(
presentation = W3cPresentation.create(
pres_req, present, link_secret, schemas, cred_defs
)

Expand Down

0 comments on commit 9f26c7d

Please sign in to comment.