fix: Replace with w3c call, change order of enum variants

Signed-off-by: Abdulbois <[email protected]> Signed-off-by: artem.ivanov <[email protected]>
hyperledger · Nov 22, 2023 · e2a21ce · e2a21ce
1 parent e5525c8
commit e2a21ce
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/src/ffi/w3c/cred_offer.rs b/src/ffi/w3c/cred_offer.rs
@@ -15,7 +15,7 @@ use ffi_support::FfiStr;
 /// # Returns
 /// Error code
 #[no_mangle]
-pub extern "C" fn anoncreds_w3c_create_credential_offer(
+pub extern "C" fn anoncreds_create_w3c_credential_offer(
     schema_id: FfiStr,
     cred_def_id: FfiStr,
     key_proof: ObjectHandle,

diff --git a/src/ffi/w3c/cred_req.rs b/src/ffi/w3c/cred_req.rs
@@ -20,7 +20,7 @@ use crate::ffi::object::ObjectHandle;
 /// # Returns
 /// Error code
 #[no_mangle]
-pub extern "C" fn anoncreds_w3c_create_credential_request(
+pub extern "C" fn anoncreds_create_w3c_credential_request(
     entropy: FfiStr,
     prover_did: FfiStr,
     cred_def: ObjectHandle,

diff --git a/src/ffi/w3c/credential.rs b/src/ffi/w3c/credential.rs
@@ -221,7 +221,7 @@ pub extern "C" fn anoncreds_w3c_credential_add_non_anoncreds_integrity_proof(
 /// # Returns
 /// Error code
 #[no_mangle]
-pub extern "C" fn anoncreds_w3c_set_credential_id(
+pub extern "C" fn anoncreds_w3c_credential_set_id(
     cred: ObjectHandle,
     id: FfiStr,
     cred_p: *mut ObjectHandle,
@@ -252,7 +252,7 @@ pub extern "C" fn anoncreds_w3c_set_credential_id(
 /// # Returns
 /// Error code
 #[no_mangle]
-pub extern "C" fn anoncreds_credential_w3c_subject_id(
+pub extern "C" fn anoncreds_w3c_credential_set_subject_id(
     cred: ObjectHandle,
     id: FfiStr,
     cred_p: *mut ObjectHandle,

diff --git a/src/ffi/w3c/presentation.rs b/src/ffi/w3c/presentation.rs
@@ -31,7 +31,7 @@ impl_anoncreds_object_from_json!(W3CPresentation, anoncreds_w3c_presentation_fro
 /// # Returns
 /// Error code
 #[no_mangle]
-pub extern "C" fn anoncreds_w3c_create_presentation(
+pub extern "C" fn anoncreds_create_w3c_presentation(
     pres_req: ObjectHandle,
     credentials: FfiList<FfiCredentialEntry>,
     credentials_prove: FfiList<FfiCredentialProve>,
@@ -83,7 +83,7 @@ pub extern "C" fn anoncreds_w3c_create_presentation(
 /// # Returns
 /// Error code
 #[no_mangle]
-pub extern "C" fn anoncreds_w3c_verify_presentation(
+pub extern "C" fn anoncreds_verify_w3c_presentation(
     presentation: ObjectHandle,
     pres_req: ObjectHandle,
     schemas: FfiList<ObjectHandle>,

diff --git a/wrappers/javascript/packages/anoncreds-nodejs/src/NodeJSAnoncreds.ts b/wrappers/javascript/packages/anoncreds-nodejs/src/NodeJSAnoncreds.ts
@@ -721,8 +721,8 @@ export class NodeJSAnoncreds implements Anoncreds {
       credentialRequest,
       attributeNames as unknown as Buffer,
       attributeRawValues as unknown as Buffer,
-      revocationConfiguration?.ref().address() ?? 0,
       encoding,
+      revocationConfiguration?.ref().address() ?? 0,
       credentialPtr
     )
     this.handleError()

diff --git a/wrappers/javascript/packages/anoncreds-nodejs/src/library/bindings.ts b/wrappers/javascript/packages/anoncreds-nodejs/src/library/bindings.ts
@@ -218,8 +218,8 @@ export const nativeBindings = {
       FFI_OBJECT_HANDLE,
       StringListStruct,
       StringListStruct,
-      FFI_OBJECT_HANDLE,
       FFI_STRING,
+      FFI_OBJECT_HANDLE,
       FFI_OBJECT_HANDLE_PTR
     ]
   ],

diff --git a/wrappers/javascript/packages/anoncreds-shared/src/api/W3CCredential.ts b/wrappers/javascript/packages/anoncreds-shared/src/api/W3CCredential.ts
@@ -83,7 +83,7 @@ export class W3CCredential extends AnoncredsObject {
   }
 
   public static fromJson(json: JsonObject) {
-    return new W3CCredential(anoncreds.credentialFromJson({ json: JSON.stringify(json) }).handle)
+    return new W3CCredential(anoncreds.w3cCredentialFromJson({ json: JSON.stringify(json) }).handle)
   }
 
   public process(options: ProcessW3CCredentialOptions) {

diff --git a/wrappers/python/anoncreds/bindings.py b/wrappers/python/anoncreds/bindings.py
@@ -1024,10 +1024,10 @@ def create_w3c_credential(
         cred_request,
         names_list,
         raw_values_list,
+        encode_str(encoding),
         pointer(revocation_config)
         if revocation_config
         else POINTER(RevocationConfig)(),
-        encode_str(encoding),
         byref(cred),
     )
     return cred