Merge pull request #31 from blu3beri/update-schema-data-model

Update schema data model

Author: berendsliedrecht

anoncreds/src/data_types/anoncreds/schema.rs

@@ -8,16 +8,9 @@ pub const MAX_ATTRIBUTES_COUNT: usize = 125;
 
 impl_anoncreds_object_identifier!(SchemaId);
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(tag = "ver")]
-pub enum Schema {
-    #[serde(rename = "1.0")]
-    SchemaV1(SchemaV1),
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SchemaV1 {
+pub struct Schema {
     pub name: String,
     pub version: String,
     #[serde(rename = "attrNames")]
@@ -55,7 +48,7 @@ impl From<AttributeNames> for HashSet<String> {
     }
 }
 
-impl Validatable for SchemaV1 {
+impl Validatable for Schema {
     fn validate(&self) -> Result<(), ValidationError> {
         self.attr_names.validate()?;
         Ok(())
@@ -88,13 +81,12 @@ mod test_schema_validation {
     fn test_valid_schema() {
         let schema_json = json!({
             "name": "gvt",
-            "ver": "1.0",
             "version": "1.0",
             "attrNames": ["aaa", "bbb", "ccc"],
         })
         .to_string();
 
-        let schema: SchemaV1 = serde_json::from_str(&schema_json).unwrap();
+        let schema: Schema = serde_json::from_str(&schema_json).unwrap();
         assert_eq!(schema.name, "gvt");
         assert_eq!(schema.version, "1.0");
     }
@@ -103,25 +95,23 @@ mod test_schema_validation {
     fn test_invalid_name_schema() {
         let schema_json = json!({
             "name": "gvt1",
-            "ver": "1.0",
             "version": "1.0",
             "attrNames": ["aaa", "bbb", "ccc"],
         })
         .to_string();
 
-        serde_json::from_str::<SchemaV1>(&schema_json).unwrap();
+        serde_json::from_str::<Schema>(&schema_json).unwrap();
     }
 
     #[test]
     fn test_invalid_version_schema() {
         let schema_json = json!({
             "name": "gvt",
-            "ver": "1.0",
             "version": "1.1",
             "attrNames": ["aaa", "bbb", "ccc"],
         })
         .to_string();
 
-        serde_json::from_str::<SchemaV1>(&schema_json).unwrap();
+        serde_json::from_str::<Schema>(&schema_json).unwrap();
     }
 }

anoncreds/src/ffi/schema.rs

@@ -3,7 +3,8 @@ use ffi_support::FfiStr;
 use super::error::{catch_error, ErrorCode};
 use super::object::ObjectHandle;
 use super::util::FfiStrList;
-use crate::services::{issuer::create_schema, types::Schema};
+use crate::data_types::anoncreds::schema::Schema;
+use crate::services::issuer::create_schema;
 
 #[no_mangle]
 pub extern "C" fn anoncreds_create_schema(

anoncreds/src/services/issuer.rs

@@ -15,7 +15,7 @@ use crate::data_types::anoncreds::{
         RevocationRegistryDefinitionV1, RevocationRegistryDefinitionValue,
         RevocationRegistryDefinitionValuePublicKeys,
     },
-    schema::SchemaV1,
+    schema::Schema,
 };
 use crate::error::Result;
 use crate::services::helpers::*;
@@ -38,12 +38,12 @@ pub fn create_schema(
         attr_names
     );
 
-    let schema = SchemaV1 {
+    let schema = Schema {
         name: schema_name.to_string(),
         version: schema_version.to_string(),
         attr_names,
     };
-    Ok(Schema::SchemaV1(schema))
+    Ok(schema)
 }
 
 pub fn create_credential_definition<SI>(
@@ -67,8 +67,6 @@ where
     );
     let schema_id = schema_id.try_into()?;
 
-    let Schema::SchemaV1(schema) = schema;
-
     let credential_schema = build_credential_schema(&schema.attr_names.0)?;
     let non_credential_schema = build_non_credential_schema()?;
 

anoncreds/src/services/prover.rs

@@ -9,7 +9,7 @@ use crate::data_types::anoncreds::{
         AttributeValue, Identifier, RequestedProof, RevealedAttributeGroupInfo,
         RevealedAttributeInfo, SubProofReferent,
     },
-    schema::SchemaId,
+    schema::{Schema, SchemaId},
 };
 use crate::error::Result;
 use crate::services::helpers::*;
@@ -170,7 +170,6 @@ pub fn create_presentation(
         let schema = *schemas
             .get(&credential.schema_id)
             .ok_or_else(|| err_msg!("Schema not provided for ID: {}", credential.schema_id))?;
-        let Schema::SchemaV1(schema) = schema;
 
         let cred_def_id = CredentialDefinitionId::new(credential.cred_def_id.clone())?;
         let cred_def = *cred_defs.get(&cred_def_id).ok_or_else(|| {

anoncreds/src/services/types.rs

@@ -17,7 +17,7 @@ pub use crate::data_types::anoncreds::{
         IssuanceType, RegistryType, RevocationRegistryDefinition,
         RevocationRegistryDefinitionPrivate,
     },
-    schema::{AttributeNames, Schema},
+    schema::AttributeNames,
 };
 
 pub use indy_utils::did::DidValue;

anoncreds/src/services/verifier.rs

@@ -8,6 +8,7 @@ use super::types::*;
 use crate::data_types::anoncreds::cred_def::CredentialDefinitionId;
 use crate::data_types::anoncreds::rev_reg::RevocationRegistryId;
 use crate::data_types::anoncreds::rev_reg_def::RevocationRegistryDefinitionId;
+use crate::data_types::anoncreds::schema::Schema;
 use crate::data_types::anoncreds::schema::SchemaId;
 use crate::data_types::anoncreds::{
     nonce::Nonce,
@@ -83,7 +84,7 @@ pub fn verify_presentation(
     for sub_proof_index in 0..presentation.identifiers.len() {
         let identifier = presentation.identifiers[sub_proof_index].clone();
 
-        let Schema::SchemaV1(schema) = schemas
+        let schema = schemas
             .get(&identifier.schema_id)
             .ok_or_else(|| err_msg!("Schema not provided for ID: {:?}", identifier.schema_id))?;