Address code review

Signed-off-by: Miroslav Kovar <miroslav.kovar@absa.africa>
hyperledger · Aug 16, 2023 · ef7de69 · ef7de69
1 parent 5995922
commit ef7de69
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/did_doc_sov/src/extra_fields/aip1.rs b/did_doc_sov/src/extra_fields/aip1.rs
@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]
+#[serde(deny_unknown_fields)]
 pub struct ExtraFieldsAIP1 {}
diff --git a/did_doc_sov/src/extra_fields/didcommv1.rs b/did_doc_sov/src/extra_fields/didcommv1.rs
@@ -4,6 +4,7 @@ use super::{AcceptType, KeyKind};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]
 #[serde(rename_all = "camelCase")]
+#[serde(deny_unknown_fields)]
 pub struct ExtraFieldsDidCommV1 {
     priority: u32,
     recipient_keys: Vec<KeyKind>,

diff --git a/did_doc_sov/src/extra_fields/didcommv2.rs b/did_doc_sov/src/extra_fields/didcommv2.rs
@@ -4,6 +4,7 @@ use super::{AcceptType, KeyKind};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]
 #[serde(rename_all = "camelCase")]
+#[serde(deny_unknown_fields)]
 pub struct ExtraFieldsDidCommV2 {
     routing_keys: Vec<KeyKind>,
     #[serde(default)]

diff --git a/did_doc_sov/src/lib.rs b/did_doc_sov/src/lib.rs
@@ -164,7 +164,12 @@ impl Serialize for DidDocumentSov {
 
         for service_sov in &self.services {
             let service: Service<ExtraFieldsSov> = service_sov.clone().try_into().map_err(serde::ser::Error::custom)?;
-            builder = builder.add_service(service);
+            // Not very efficient, but
+            // * we don't expect many services
+            // * does not require allowing to remove services from existing DDO or builder
+            if !self.did_doc.service().iter().any(|s| s.id() == service.id()) {
+                builder = builder.add_service(service);
+            }
         }
 
         builder.build().serialize(serializer)

diff --git a/did_doc_sov/tests/serde.rs b/did_doc_sov/tests/serde.rs
@@ -68,7 +68,7 @@ const DID_DOC_DATA: &'static str = r#"
 "#;
 
 #[test]
-fn test_serde() {
+fn test_deserialization() {
     let did_doc = serde_json::from_str::<DidDocumentSov>(DID_DOC_DATA).unwrap();
     assert_eq!(did_doc.id().to_string(), "did:sov:HR6vs6GEZ8rHaVgjg2WodM");
     assert_eq!(did_doc.verification_method().len(), 2);
@@ -136,3 +136,11 @@ fn test_serde() {
         panic!("Expected reference key kind");
     }
 }
+
+#[test]
+fn test_deserialization_and_serialization() {
+    let did_doc_1 = serde_json::from_str::<DidDocumentSov>(DID_DOC_DATA).unwrap();
+    let serialized = serde_json::to_string_pretty(&did_doc_1).unwrap();
+    let did_doc_2 = serde_json::from_str::<DidDocumentSov>(&serialized).unwrap();
+    assert_eq!(did_doc_1, did_doc_2);
+}