Move w3c modules under the feature

Signed-off-by: artem.ivanov <[email protected]>

Cargo.toml

@@ -19,11 +19,12 @@ path = "src/lib.rs"
 crate-type = ["staticlib", "rlib", "cdylib"]
 
 [features]
-default = ["ffi", "logger", "zeroize"]
+default = ["ffi", "logger", "zeroize", "w3c"]
 ffi = ["dep:ffi-support"]
 zeroize = ["dep:zeroize"]
 logger = ["dep:env_logger"]
 vendored = ["anoncreds-clsignatures/openssl_vendored"]
+w3c = ["base64", "chrono"]
 
 [dependencies]
 anoncreds-clsignatures = "0.2.4"
@@ -40,8 +41,8 @@ serde_json = { version = "1.0.94", features = ["raw_value"] }
 sha2 = "0.10.6"
 thiserror = "1.0.39"
 zeroize = { version = "1.5.7", optional = true, features = ["zeroize_derive"] }
-base64 = "0.21.5"
-chrono = { version = "0.4.31", features = ["serde"] }
+base64 = { version = "0.21.5", optional = true }
+chrono = { version = "0.4.31", optional = true, features = ["serde"] }
 
 [profile.release]
 lto = true

src/data_types/mod.rs

@@ -40,5 +40,6 @@ pub mod macros;
 /// Identifier wrapper for the issuer
 pub mod issuer_id;
 
+#[cfg(feature = "w3c")]
 /// W3C Credential standard definitions
 pub mod w3c;

src/ffi/mod.rs

@@ -34,6 +34,8 @@ mod pres_req;
 mod presentation;
 mod revocation;
 mod schema;
+
+#[cfg(feature = "w3c")]
 mod w3c;
 
 #[no_mangle]

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,

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,

src/ffi/w3c/credential.rs

@@ -13,10 +13,11 @@ use crate::ffi::credential::{FfiCredRevInfo, _link_secret, _revocation_config};
 use crate::ffi::error::{catch_error, ErrorCode};
 use crate::ffi::object::{AnoncredsObject, ObjectHandle};
 use crate::ffi::util::FfiStrList;
-use crate::types::{Credential, MakeCredentialAttributes};
+use crate::types::Credential;
 use crate::w3c::credential_conversion::{credential_from_w3c, credential_to_w3c};
 use crate::w3c::issuer::create_credential;
 use crate::w3c::prover::process_credential;
+use crate::w3c::types::MakeCredentialAttributes;
 
 impl_anoncreds_object!(W3CCredential, "W3CCredential");
 impl_anoncreds_object_from_json!(W3CCredential, anoncreds_w3c_credential_from_json);
@@ -220,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,
@@ -251,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_subject_id(
     cred: ObjectHandle,
     id: FfiStr,
     cred_p: *mut ObjectHandle,

src/services/helpers.rs

@@ -5,7 +5,6 @@ use crate::cl::{
 use crate::data_types::presentation::RequestedProof;
 use crate::data_types::rev_reg_def::RevocationRegistryDefinitionId;
 use crate::data_types::schema::Schema;
-use crate::data_types::w3c::credential::{CredentialAttributeValue, W3CCredential};
 use crate::data_types::{
     credential::CredentialValues,
     link_secret::LinkSecret,
@@ -278,21 +277,3 @@ impl RequestedProof {
         referents
     }
 }
-
-impl W3CCredential {
-    pub(crate) fn get_attribute(
-        &self,
-        requested_attribute: &str,
-    ) -> Result<(String, CredentialAttributeValue)> {
-        let requested_attribute = attr_common_view(requested_attribute);
-        for (attribute, value) in self.credential_subject.attributes.0.iter() {
-            if attr_common_view(attribute) == requested_attribute {
-                return Ok((attribute.to_owned(), value.to_owned()));
-            }
-        }
-        Err(err_msg!(
-            "Credential attribute {} not found",
-            requested_attribute
-        ))
-    }
-}

src/services/mod.rs

@@ -4,4 +4,6 @@ pub mod prover;
 pub mod tails;
 pub mod types;
 pub mod verifier;
+
+#[cfg(feature = "w3c")]
 pub mod w3c;

src/services/types.rs

@@ -1,5 +1,4 @@
 use crate::cl::{RevocationRegistry as CryptoRevocationRegistry, Witness};
-use crate::data_types::w3c::credential::{CredentialAttributeValue, CredentialAttributes};
 pub use crate::data_types::{
     cred_def::{CredentialDefinitionPrivate, CredentialKeyCorrectnessProof, SignatureType},
     cred_offer::CredentialOffer,
@@ -76,23 +75,6 @@ impl From<MakeCredentialValues> for CredentialValues {
     }
 }
 
-#[derive(Debug, Default)]
-pub struct MakeCredentialAttributes(pub(crate) CredentialAttributes);
-
-impl MakeCredentialAttributes {
-    pub fn add(&mut self, name: impl Into<String>, raw: impl Into<String>) {
-        self.0
-             .0
-            .insert(name.into(), CredentialAttributeValue::Attribute(raw.into()));
-    }
-}
-
-impl From<MakeCredentialAttributes> for CredentialAttributes {
-    fn from(m: MakeCredentialAttributes) -> Self {
-        m.0
-    }
-}
-
 #[derive(Debug)]
 pub struct PresentCredentials<'p, T>(pub(crate) Vec<PresentCredential<'p, T>>);
 

src/services/w3c/credential_conversion.rs

@@ -140,7 +140,8 @@ pub fn credential_to_w3c(
 /// use anoncreds::w3c;
 /// use anoncreds::issuer;
 /// use anoncreds::prover;
-/// use anoncreds::types::{MakeCredentialAttributes, MakeCredentialValues};
+/// use anoncreds::w3c::types::MakeCredentialAttributes;
+/// use anoncreds::types::MakeCredentialValues;
 ///
 /// use anoncreds::types::CredentialDefinitionConfig;
 /// use anoncreds::types::SignatureType;

src/services/w3c/helpers.rs

@@ -0,0 +1,21 @@
+use crate::data_types::w3c::credential::{CredentialAttributeValue, W3CCredential};
+use crate::error::Result;
+use crate::helpers::attr_common_view;
+
+impl W3CCredential {
+    pub(crate) fn get_attribute(
+        &self,
+        requested_attribute: &str,
+    ) -> Result<(String, CredentialAttributeValue)> {
+        let requested_attribute = attr_common_view(requested_attribute);
+        for (attribute, value) in self.credential_subject.attributes.0.iter() {
+            if attr_common_view(attribute) == requested_attribute {
+                return Ok((attribute.to_owned(), value.to_owned()));
+            }
+        }
+        Err(err_msg!(
+            "Credential attribute {} not found",
+            requested_attribute
+        ))
+    }
+}

src/services/w3c/issuer.rs

@@ -23,7 +23,7 @@ use crate::types::{
 /// ```rust
 /// use anoncreds::{issuer, w3c};
 /// use anoncreds::prover;
-/// use anoncreds::types::MakeCredentialAttributes;
+/// use anoncreds::w3c::types::MakeCredentialAttributes;
 ///
 /// use anoncreds::types::CredentialDefinitionConfig;
 /// use anoncreds::types::SignatureType;

src/services/w3c/mod.rs

@@ -1,4 +1,6 @@
 pub mod credential_conversion;
+pub mod helpers;
 pub mod issuer;
 pub mod prover;
+pub mod types;
 pub mod verifier;

src/services/w3c/prover.rs

@@ -27,7 +27,7 @@ use std::collections::HashMap;
 /// ```rust
 /// use anoncreds::{issuer, w3c};
 /// use anoncreds::prover;
-/// use anoncreds::types::MakeCredentialAttributes;
+/// use anoncreds::w3c::types::MakeCredentialAttributes;
 ///
 /// use anoncreds::types::CredentialDefinitionConfig;
 /// use anoncreds::types::SignatureType;

src/services/w3c/types.rs

@@ -0,0 +1,18 @@
+use crate::data_types::w3c::credential::{CredentialAttributeValue, CredentialAttributes};
+
+#[derive(Debug, Default)]
+pub struct MakeCredentialAttributes(pub(crate) CredentialAttributes);
+
+impl MakeCredentialAttributes {
+    pub fn add(&mut self, name: impl Into<String>, raw: impl Into<String>) {
+        self.0
+             .0
+            .insert(name.into(), CredentialAttributeValue::Attribute(raw.into()));
+    }
+}
+
+impl From<MakeCredentialAttributes> for CredentialAttributes {
+    fn from(m: MakeCredentialAttributes) -> Self {
+        m.0
+    }
+}

src/utils/mod.rs

@@ -3,8 +3,10 @@ pub mod validation;
 
 pub mod base58;
 
+#[cfg(feature = "w3c")]
 pub mod base64;
 
+#[cfg(feature = "w3c")]
 pub mod encoded_object;
 
 pub mod hash;

tests/anoncreds_demos.rs

@@ -8,9 +8,10 @@ use anoncreds::data_types::w3c::presentation_proof::{PredicateAttribute, Predica
 use anoncreds::data_types::w3c::uri::URI;
 use anoncreds::prover;
 use anoncreds::tails::TailsFileWriter;
-use anoncreds::types::{CredentialRevocationConfig, MakeCredentialAttributes, PresentCredentials};
+use anoncreds::types::{CredentialRevocationConfig, PresentCredentials};
 use anoncreds::verifier;
 use anoncreds::w3c::credential_conversion::{credential_from_w3c, credential_to_w3c};
+use anoncreds::w3c::types::MakeCredentialAttributes;
 use anoncreds::{issuer, w3c};
 use serde_json::json;
 use std::collections::{BTreeSet, HashMap};

tests/utils/fixtures.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use anoncreds::types::MakeCredentialAttributes;
+use anoncreds::w3c::types::MakeCredentialAttributes;
 use anoncreds::{
     data_types::{
         cred_def::{CredentialDefinition, CredentialDefinitionId},

tests/utils/mock.rs

@@ -7,10 +7,9 @@ use std::{
 
 use anoncreds::data_types::w3c::credential::W3CCredential;
 use anoncreds::data_types::w3c::presentation::W3CPresentation;
-use anoncreds::types::{
-    MakeCredentialAttributes, RevocationRegistryDefinition, RevocationStatusList,
-};
+use anoncreds::types::{RevocationRegistryDefinition, RevocationStatusList};
 use anoncreds::w3c::credential_conversion::{credential_from_w3c, credential_to_w3c};
+use anoncreds::w3c::types::MakeCredentialAttributes;
 use anoncreds::{
     data_types::{
         cred_def::{CredentialDefinition, CredentialDefinitionId},