Merge pull request #118 from AbsaOSS/cleanup/disclosed-proof

Remove legacy disclosed proof

Author: Patrik-Stas

libvcx/src/disclosed_proof.rs

@@ -50,6 +50,7 @@ pub mod disclosed_proof;
 
 pub mod v3;
 mod proof_utils;
+mod disclosed_proof_utils;
 
 #[allow(unused_imports)]
 #[allow(dead_code)]

libvcx/src/disclosed_proof_utils.rs

@@ -3,6 +3,7 @@ use serde_json::Value;
 
 use api::VcxStateType;
 use error::prelude::*;
+use messages::proofs::proof_request::NonRevokedInterval;
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 pub struct ProofMessage {
@@ -16,13 +17,26 @@ pub struct ProofMessage {
 }
 
 #[derive(Debug, Deserialize, Serialize, PartialEq)]
-pub struct CredInfo {
+pub struct CredInfoVerifier {
     pub schema_id: String,
     pub cred_def_id: String,
     pub rev_reg_id: Option<String>,
     pub timestamp: Option<u64>,
 }
 
+#[derive(Debug, Deserialize, Serialize, PartialEq)]
+pub struct CredInfoProver {
+    pub requested_attr: String,
+    pub referent: String,
+    pub schema_id: String,
+    pub cred_def_id: String,
+    pub rev_reg_id: Option<String>,
+    pub cred_rev_id: Option<String>,
+    pub revocation_interval: Option<NonRevokedInterval>,
+    pub tails_file: Option<String>,
+    pub timestamp: Option<u64>,
+}
+
 impl ProofMessage {
     pub fn new() -> ProofMessage {
         ProofMessage {
@@ -56,12 +70,12 @@ impl ProofMessage {
             .map_err(|err| VcxError::from_msg(VcxErrorKind::InvalidProof, format!("Cannot deserialize proof: {}", err)))
     }
 
-    pub fn get_credential_info(&self) -> VcxResult<Vec<CredInfo>> {
+    pub fn get_credential_info(&self) -> VcxResult<Vec<CredInfoVerifier>> {
         get_credential_info(&self.libindy_proof)
     }
 }
 
-pub fn get_credential_info(proof: &str) -> VcxResult<Vec<CredInfo>> {
+pub fn get_credential_info(proof: &str) -> VcxResult<Vec<CredInfoVerifier>> {
     let mut rtn = Vec::new();
 
     let credentials: Value = serde_json::from_str(&proof)
@@ -77,7 +91,7 @@ pub fn get_credential_info(proof: &str) -> VcxResult<Vec<CredInfo>> {
 
                 let timestamp = identifier["timestamp"].as_u64();
                 rtn.push(
-                    CredInfo {
+                    CredInfoVerifier {
                         schema_id: schema_id.to_string(),
                         cred_def_id: cred_def_id.to_string(),
                         rev_reg_id,
@@ -162,7 +176,7 @@ pub mod tests {
             "schema_id": SCHEMA_ID,
             "cred_def_id": CRED_DEF_ID,
         }]}).to_string();
-        let mut cred_info = CredInfo {
+        let mut cred_info = CredInfoVerifier {
             schema_id: SCHEMA_ID.to_string(),
             cred_def_id: CRED_DEF_ID.to_string(),
             rev_reg_id: None,

libvcx/src/lib.rs

@@ -2,7 +2,7 @@ use serde_json;
 use serde_json::Value;
 
 use error::prelude::*;
-use messages::proofs::proof_message::{CredInfo, get_credential_info};
+use messages::proofs::proof_message::{CredInfoVerifier, get_credential_info};
 use object_cache::ObjectCache;
 use settings;
 use settings::get_config_value;

libvcx/src/messages/proofs/proof_message.rs

@@ -2,7 +2,10 @@ use serde_json;
 use serde_json::Value;
 
 use error::prelude::*;
-use messages::proofs::proof_message::{CredInfo, get_credential_info};
+use messages::proofs::proof_message::{
+    CredInfoVerifier,
+    get_credential_info
+};
 use object_cache::ObjectCache;
 use settings;
 use settings::get_config_value;
@@ -37,7 +40,7 @@ fn validate_proof_revealed_attributes(proof_json: &str) -> VcxResult<()> {
     Ok(())
 }
 
-fn build_credential_defs_json(credential_data: &Vec<CredInfo>) -> VcxResult<String> {
+fn build_cred_defs_json_verifier(credential_data: &Vec<CredInfoVerifier>) -> VcxResult<String> {
     debug!("building credential_def_json for proof validation");
     let mut credential_json = json!({});
 
@@ -55,7 +58,7 @@ fn build_credential_defs_json(credential_data: &Vec<CredInfo>) -> VcxResult<Stri
     Ok(credential_json.to_string())
 }
 
-fn build_schemas_json(credential_data: &Vec<CredInfo>) -> VcxResult<String> {
+fn build_schemas_json_verifier(credential_data: &Vec<CredInfoVerifier>) -> VcxResult<String> {
     debug!("building schemas json for proof validation");
 
     let mut schemas_json = json!({});
@@ -75,7 +78,7 @@ fn build_schemas_json(credential_data: &Vec<CredInfo>) -> VcxResult<String> {
     Ok(schemas_json.to_string())
 }
 
-fn build_rev_reg_defs_json(credential_data: &Vec<CredInfo>) -> VcxResult<String> {
+fn build_rev_reg_defs_json(credential_data: &Vec<CredInfoVerifier>) -> VcxResult<String> {
     debug!("building rev_reg_def_json for proof validation");
 
     let mut rev_reg_defs_json = json!({});
@@ -100,7 +103,7 @@ fn build_rev_reg_defs_json(credential_data: &Vec<CredInfo>) -> VcxResult<String>
     Ok(rev_reg_defs_json.to_string())
 }
 
-fn build_rev_reg_json(credential_data: &Vec<CredInfo>) -> VcxResult<String> {
+fn build_rev_reg_json(credential_data: &Vec<CredInfoVerifier>) -> VcxResult<String> {
     debug!("building rev_reg_json for proof validation");
 
     let mut rev_regs_json = json!({});
@@ -140,9 +143,9 @@ pub fn validate_indy_proof(proof_json: &str, proof_req_json: &str) -> VcxResult<
 
     let credential_data = get_credential_info(&proof_json)?;
 
-    let credential_defs_json = build_credential_defs_json(&credential_data)
+    let credential_defs_json = build_cred_defs_json_verifier(&credential_data)
         .unwrap_or(json!({}).to_string());
-    let schemas_json = build_schemas_json(&credential_data)
+    let schemas_json = build_schemas_json_verifier(&credential_data)
         .unwrap_or(json!({}).to_string());
     let rev_reg_defs_json = build_rev_reg_defs_json(&credential_data)
         .unwrap_or(json!({}).to_string());
@@ -178,23 +181,23 @@ pub mod tests {
 
     #[test]
     #[cfg(feature = "general_test")]
-    fn test_build_credential_defs_json_with_multiple_credentials() {
+    fn test_build_cred_defs_json_verifier_with_multiple_credentials() {
         let _setup = SetupStrictAriesMocks::init();
 
-        let cred1 = CredInfo {
+        let cred1 = CredInfoVerifier {
             schema_id: "schema_key1".to_string(),
             cred_def_id: "cred_def_key1".to_string(),
             rev_reg_id: None,
             timestamp: None,
         };
-        let cred2 = CredInfo {
+        let cred2 = CredInfoVerifier {
             schema_id: "schema_key2".to_string(),
             cred_def_id: "cred_def_key2".to_string(),
             rev_reg_id: None,
             timestamp: None,
         };
         let credentials = vec![cred1, cred2];
-        let credential_json = build_credential_defs_json(&credentials).unwrap();
+        let credential_json = build_cred_defs_json_verifier(&credentials).unwrap();
 
         let json: Value = serde_json::from_str(CRED_DEF_JSON).unwrap();
         let expected = json!({CRED_DEF_ID:json}).to_string();
@@ -203,23 +206,23 @@ pub mod tests {
 
     #[test]
     #[cfg(feature = "general_test")]
-    fn test_build_schemas_json_with_multiple_schemas() {
+    fn test_build_schemas_json_verifier_with_multiple_schemas() {
         let _setup = SetupStrictAriesMocks::init();
 
-        let cred1 = CredInfo {
+        let cred1 = CredInfoVerifier {
             schema_id: "schema_key1".to_string(),
             cred_def_id: "cred_def_key1".to_string(),
             rev_reg_id: None,
             timestamp: None,
         };
-        let cred2 = CredInfo {
+        let cred2 = CredInfoVerifier {
             schema_id: "schema_key2".to_string(),
             cred_def_id: "cred_def_key2".to_string(),
             rev_reg_id: None,
             timestamp: None,
         };
         let credentials = vec![cred1, cred2];
-        let schema_json = build_schemas_json(&credentials).unwrap();
+        let schema_json = build_schemas_json_verifier(&credentials).unwrap();
 
         let json: Value = serde_json::from_str(SCHEMA_JSON).unwrap();
         let expected = json!({SCHEMA_ID:json}).to_string();
@@ -231,13 +234,13 @@ pub mod tests {
     fn test_build_rev_reg_defs_json() {
         let _setup = SetupStrictAriesMocks::init();
 
-        let cred1 = CredInfo {
+        let cred1 = CredInfoVerifier {
             schema_id: "schema_key1".to_string(),
             cred_def_id: "cred_def_key1".to_string(),
             rev_reg_id: Some("id1".to_string()),
             timestamp: None,
         };
-        let cred2 = CredInfo {
+        let cred2 = CredInfoVerifier {
             schema_id: "schema_key2".to_string(),
             cred_def_id: "cred_def_key2".to_string(),
             rev_reg_id: Some("id2".to_string()),
@@ -256,13 +259,13 @@ pub mod tests {
     fn test_build_rev_reg_json() {
         let _setup = SetupStrictAriesMocks::init();
 
-        let cred1 = CredInfo {
+        let cred1 = CredInfoVerifier {
             schema_id: "schema_key1".to_string(),
             cred_def_id: "cred_def_key1".to_string(),
             rev_reg_id: Some("id1".to_string()),
             timestamp: Some(1),
         };
-        let cred2 = CredInfo {
+        let cred2 = CredInfoVerifier {
             schema_id: "schema_key2".to_string(),
             cred_def_id: "cred_def_key2".to_string(),
             rev_reg_id: Some("id2".to_string()),