Merge pull request hyperledger-indy#774 from Artemkaaas/bugfix/filtering

Fixed credentials filtering bug

Author: jovfer

libindy/src/domain/credential.rs

@@ -40,17 +40,25 @@ pub struct CredentialInfo {
 }
 
 impl CredentialInfo {
-    fn parts(&self) -> Vec<&str> {
-        self.cred_def_id.split_terminator(DELIMITER).collect::<Vec<&str>>()
+    fn schema_parts(&self) -> Vec<&str> {
+        self.schema_id.split_terminator(DELIMITER).collect::<Vec<&str>>()
     }
 }
 
 impl Filtering for CredentialInfo {
     fn schema_id(&self) -> String { self.schema_id.to_string() }
-    fn schema_issuer_did(&self) -> String { self.parts().get(3).map(|s| s.to_string()).unwrap_or(String::new()) }
-    fn schema_name(&self) -> String { self.parts().get(5).map(|s| s.to_string()).unwrap_or(String::new()) }
-    fn schema_version(&self) -> String { self.parts().get(6).map(|s| s.to_string()).unwrap_or(String::new()) }
-    fn issuer_did(&self) -> String { self.parts()[0].to_string() }
+    fn schema_issuer_did(&self) -> String {
+        self.schema_parts().get(0).map(|s| s.to_string()).unwrap_or(String::new())
+    }
+    fn schema_name(&self) -> String {
+        self.schema_parts().get(2).map(|s| s.to_string()).unwrap_or(String::new())
+    }
+    fn schema_version(&self) -> String {
+        self.schema_parts().get(3).map(|s| s.to_string()).unwrap_or(String::new())
+    }
+    fn issuer_did(&self) -> String {
+        self.cred_def_id.split_terminator(DELIMITER).collect::<Vec<&str>>()[0].to_string()
+    }
     fn cred_def_id(&self) -> String { self.cred_def_id.to_string() }
 }
 

libindy/tests/interaction.rs

@@ -173,6 +173,10 @@ fn anoncreds_revocation_interaction_test_issuance_by_demand() {
                                             &cred_def_json,
                                             Some(&revoc_reg_def_json)).unwrap();
 
+    let credentials = AnoncredsUtils::prover_get_credentials(prover_wallet_handle, &format!(r#"{{"schema_name":"{}"}}"#, GVT_SCHEMA_NAME)).unwrap();
+    let credentials: Vec<serde_json::Value> = serde_json::from_str(&credentials).unwrap();
+    assert_eq!(credentials.len(), 1);
+
     // Verifying Prover Credential
     thread::sleep(std::time::Duration::from_secs(3));