fixes: PR fixes and rename test files

Signed-off-by: bwty <[email protected]>

src/ffi/presentation.rs

@@ -24,7 +24,7 @@ impl_anoncreds_object_from_json!(Presentation, anoncreds_presentation_from_json)
 #[repr(C)]
 pub struct FfiCredentialEntry {
     credential: ObjectHandle,
-    timestamp: i64,
+    timestamp: i32,
     rev_state: ObjectHandle,
 }
 
@@ -218,10 +218,10 @@ pub extern "C" fn anoncreds_create_presentation(
 pub struct FfiNonrevokedIntervalOverride<'a> {
     rev_reg_def_id: FfiStr<'a>,
     /// Timestamp in the `PresentationRequest`
-    requested_from_ts: i64,
+    requested_from_ts: i32,
     /// Timestamp from which verifier accepts,
     /// should be less than `req_timestamp`
-    override_rev_status_list_ts: i64,
+    override_rev_status_list_ts: i32,
 }
 
 impl<'a> FfiNonrevokedIntervalOverride<'a> {

src/services/helpers.rs

@@ -146,7 +146,7 @@ pub fn get_revealed_attributes_for_credential(
 ) -> Result<(Vec<AttributeInfo>, Option<NonRevokedInterval>)> {
     trace!("_get_revealed_attributes_for_credential >>> sub_proof_index: {:?}, requested_credentials: {:?}, pres_req: {:?}",
            sub_proof_index, requested_proof, pres_req);
-    let mut nonrevoked_interval: Option<NonRevokedInterval> = None;
+    let mut non_revoked_interval: Option<NonRevokedInterval> = None;
     let mut revealed_attrs_for_credential = requested_proof
         .revealed_attrs
         .iter()
@@ -157,11 +157,11 @@ pub fn get_revealed_attributes_for_credential(
         .map(|(attr_referent, _)| {
             let info = pres_req.requested_attributes[attr_referent].clone();
             if let Some(int) = &info.non_revoked {
-                match nonrevoked_interval.as_mut() {
+                match non_revoked_interval.as_mut() {
                     Some(ni) => {
                         ni.compare_and_set(int);
                     }
-                    None => nonrevoked_interval = Some(int.clone()),
+                    None => non_revoked_interval = Some(int.clone()),
                 }
             };
 
@@ -180,11 +180,11 @@ pub fn get_revealed_attributes_for_credential(
             .map(|(attr_referent, _)| {
                 let info = pres_req.requested_attributes[attr_referent].clone();
                 if let Some(int) = &info.non_revoked {
-                    match nonrevoked_interval.as_mut() {
+                    match non_revoked_interval.as_mut() {
                         Some(ni) => {
                             ni.compare_and_set(int);
                         }
-                        None => nonrevoked_interval = Some(NonRevokedInterval::default()),
+                        None => non_revoked_interval = Some(NonRevokedInterval::default()),
                     }
                 };
                 info
@@ -197,7 +197,7 @@ pub fn get_revealed_attributes_for_credential(
         revealed_attrs_for_credential
     );
 
-    Ok((revealed_attrs_for_credential, nonrevoked_interval))
+    Ok((revealed_attrs_for_credential, non_revoked_interval))
 }
 
 pub fn get_predicates_for_credential(
@@ -208,7 +208,7 @@ pub fn get_predicates_for_credential(
     trace!("_get_predicates_for_credential >>> sub_proof_index: {:?}, requested_credentials: {:?}, pres_req: {:?}",
            sub_proof_index, requested_proof, pres_req);
 
-    let mut nonrevoked_interval: Option<NonRevokedInterval> = None;
+    let mut non_revoked_interval: Option<NonRevokedInterval> = None;
     let predicates_for_credential = requested_proof
         .predicates
         .iter()
@@ -221,11 +221,11 @@ pub fn get_predicates_for_credential(
         .map(|(predicate_referent, _)| {
             let info = pres_req.requested_predicates[predicate_referent].clone();
             if let Some(int) = &info.non_revoked {
-                match nonrevoked_interval.as_mut() {
+                match non_revoked_interval.as_mut() {
                     Some(ni) => {
                         ni.compare_and_set(int);
                     }
-                    None => nonrevoked_interval = Some(int.clone()),
+                    None => non_revoked_interval = Some(int.clone()),
                 }
             };
 
@@ -238,5 +238,5 @@ pub fn get_predicates_for_credential(
         predicates_for_credential
     );
 
-    Ok((predicates_for_credential, nonrevoked_interval))
+    Ok((predicates_for_credential, non_revoked_interval))
 }

tests/anoncreds_demos.rs

@@ -22,8 +22,7 @@ use anoncreds::{
 
 use serde_json::json;
 
-use self::utils::anoncreds::ProverWallet;
-
+use utils::*;
 mod utils;
 
 pub static SCHEMA_ID: &str = "mock:uri";

tests/utils/mock.rs

@@ -1,4 +1,4 @@
-use super::anoncreds::{IssuerWallet, Ledger, ProverWallet, StoredCredDef, StoredRevDef};
+use super::storage::{IssuerWallet, Ledger, ProverWallet, StoredCredDef, StoredRevDef};
 use std::{
     collections::{BTreeSet, HashMap},
     fs::create_dir,

tests/utils/mod.rs

@@ -1,4 +1,5 @@
-pub mod anoncreds;
 pub mod mock;
+pub mod storage;
 
 pub use mock::*;
+pub use storage::*;