From ab7659c933acbcff8ed925b7987431ea599188c4 Mon Sep 17 00:00:00 2001 From: Berend Sliedrecht Date: Sat, 9 Sep 2023 11:26:31 +0200 Subject: [PATCH 1/3] create zeroize feature Signed-off-by: Berend Sliedrecht --- Cargo.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 883b97fc..81ef9924 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,8 +20,9 @@ crate-type = ["staticlib", "rlib", "cdylib"] [features] default = ["ffi", "logger", "zeroize"] -ffi = ["ffi-support"] -logger = ["env_logger"] +ffi = ["dep:ffi-support"] +zeroize = ["dep:zeroize"] +logger = ["dep:env_logger"] vendored = ["anoncreds-clsignatures/openssl_vendored"] [dependencies] From f184b7a3d43fa0046433b9f1f8a9fcc6afd300b4 Mon Sep 17 00:00:00 2001 From: Berend Sliedrecht Date: Sat, 9 Sep 2023 11:26:48 +0200 Subject: [PATCH 2/3] change blu3beri to berendsliedrecht GitHub name Signed-off-by: Berend Sliedrecht --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index f4d881fa..7def94ac 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -9,7 +9,7 @@ | Name | Github | LFID | | ---------------- | ---------------- | ---------------- | | Andrew Whitehead | andrewwhitehead | cywolf | -| Berend Sliedrecht| blu3beri | beri14 | +| Berend Sliedrecht| berendsliedrecht | beri14 | | Darko Kulic | dkulic | dkulic | | Stephen Curran | swcurran | swcurran | | Timo Glastra | TimoGlastra | TimoGlastra | From ee0dc133b5bea745fbb9a4b3fa3fcdf4de8264b2 Mon Sep 17 00:00:00 2001 From: Berend Sliedrecht Date: Sat, 9 Sep 2023 11:27:09 +0200 Subject: [PATCH 3/3] fix cargo issues and test work without default-features Signed-off-by: Berend Sliedrecht --- src/ffi/credential.rs | 2 +- src/services/mod.rs | 7 +------ tests/multiple-credentials.rs | 2 ++ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/ffi/credential.rs b/src/ffi/credential.rs index 0855650e..306a455c 100644 --- a/src/ffi/credential.rs +++ b/src/ffi/credential.rs @@ -9,10 +9,10 @@ use super::util::FfiStrList; use crate::data_types::link_secret::LinkSecret; use crate::error::Result; use crate::services::{ + helpers::encode_credential_attribute, issuer::create_credential, prover::process_credential, types::{Credential, CredentialRevocationConfig, MakeCredentialValues}, - utils::encode_credential_attribute, }; use crate::Error; diff --git a/src/services/mod.rs b/src/services/mod.rs index 8261db6e..3458282c 100644 --- a/src/services/mod.rs +++ b/src/services/mod.rs @@ -1,11 +1,6 @@ -mod helpers; - +pub(crate) mod helpers; pub mod issuer; pub mod prover; pub mod tails; pub mod types; pub mod verifier; - -pub mod utils { - pub use super::helpers::encode_credential_attribute; -} diff --git a/tests/multiple-credentials.rs b/tests/multiple-credentials.rs index 14f8474c..4116edd4 100644 --- a/tests/multiple-credentials.rs +++ b/tests/multiple-credentials.rs @@ -191,7 +191,9 @@ fn test_requests_generate<'a>() -> Vec> { #[test] fn anoncreds_with_multiple_credentials_per_request() { + #[cfg(feature = "logger")] env_logger::init(); + let mut mock = utils::Mock::new(&[ISSUER_ID], &[PROVER_ID], TF_PATH, MAX_CRED_NUM); let issuer1_creds = create_issuer_data();