PR fixes

Author: Sergey Kudryashov

core/Cargo.toml

@@ -13,4 +13,4 @@ map = "0.0.0"
 serde = { version = "1.0", features = ["derive"] }
 
 [dev-dependencies]
-assert-json-diff = "2.0.2"
+assert-json-diff = "2.0.2"

core/src/credential.rs

@@ -33,15 +33,15 @@ struct CredentialSubject {
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(bound(deserialize = "'de: 'static"))]
-pub struct Credential {
+pub struct VerifiableCredential {
     #[serde(flatten)]
-    verifiable_credential:VerifiableCredential,
+    credential:Credential,
     proof: IntegrityProof,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(bound(deserialize = "'de: 'static"))]
-pub struct VerifiableCredential {
+pub struct Credential {
     #[serde(rename = "@context")]
     context:  VerificationContext,
     #[serde(rename = "@id")]
@@ -66,14 +66,14 @@ pub struct IntegrityProof {
     proof_value: String,
 }
 
-impl VerifiableCredential {
+impl Credential {
     pub fn new (
         context: VerificationContext,
         cred_type: String, 
         cred_subject: HashMap<String, Value>, 
         property_set: HashMap<String, Value>, id: &str) 
-    -> VerifiableCredential {    
-        let vc = VerifiableCredential {
+    -> Credential {    
+        let vc = Credential {
             context: context,
             id: id.to_string(),
             cred_type: cred_type.to_string(),

core/src/lib.rs

@@ -38,8 +38,8 @@ pub trait DocumentBuilder {
         cred_subject: HashMap<String, Value>,
         property_set: HashMap<String, Value>,
         id: &str
-    ) -> Result<VerifiableCredential, Box<dyn std::error::Error>> {
-        let vc = VerifiableCredential::new(CONTEXT_CREDENTIALS,
+    ) -> Result<Credential, Box<dyn std::error::Error>> {
+        let vc = Credential::new(CONTEXT_CREDENTIALS,
             cred_type,
             cred_subject,
             property_set,
@@ -148,7 +148,6 @@ mod tests {
             },
         });
 
-        // let vc = serde_json::to_string("VerifiableCredential").unwrap();
         let type_rs = serde_json::to_value(["VerifiableCredential".to_string(), "PermanentResidentCard".to_string()]);
         if type_rs.is_ok() {
             kv_body.entry("type".to_string()).or_insert(type_rs.unwrap());
@@ -189,4 +188,4 @@ mod tests {
         assert_json_eq!(_expect, vc.unwrap());
         Ok(())
     } 
-}
+}