Refactoring

Signed-off-by: Patrik Stas <[email protected]>
hyperledger · Dec 7, 2023 · 784828a · 784828a
1 parent 764138e
commit 784828a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 47 deletions.
diff --git a/aries/aries_vcx/src/common/ledger/service_didsov.rs b/aries/aries_vcx/src/common/ledger/service_didsov.rs
@@ -88,7 +88,7 @@ mod unit_tests {
                 ServiceType::AIP1.to_string(),
                 ServiceType::DIDCommV1.to_string(),
                 ServiceType::DIDCommV2.to_string(),
-                ServiceType::Other("foobar".to_string()),
+                "foobar".to_string(),
             ]));
 
         let expected = json!({
@@ -124,7 +124,7 @@ mod unit_tests {
                 ServiceType::AIP1.to_string(),
                 ServiceType::DIDCommV1.to_string(),
                 ServiceType::DIDCommV2.to_string(),
-                ServiceType::Other("foobar".to_string())
+                "foobar".to_string()
             ])
         );
     }

diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/ledger.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/ledger.rs
@@ -94,24 +94,6 @@ pub async fn ledger_write_endpoint(
     endpoint: String,
 ) -> LibvcxResult<EndpointDidSov> {
     let wallet = get_main_wallet()?;
-    // let service =
-    //     DidSovEndpointAttrib::create()
-    //         .set_service_endpoint(Url::from_str(&endpoint).map_err(|err| {
-    //             LibvcxError::from_msg(LibvcxErrorKind::InvalidUrl, err.to_string())
-    //         })?)
-    //         .set_types(Some(vec![
-    //             DidSovServiceType::Endpoint,
-    //             DidSovServiceType::DidCommunication,
-    //         ]))
-    //         .set_routing_keys(Some(routing_keys));
-
-    // write_endpoint(
-    //     wallet.as_ref(),
-    //     get_main_ledger_write()?.as_ref(),
-    //     target_did,
-    //     &service,
-    // )
-
     let endpoint = Url::from_str(&endpoint)
         .map_err(|err| LibvcxError::from_msg(LibvcxErrorKind::InvalidUrl, err.to_string()))?;
     let mut sov_service_extras = HashMap::new();
@@ -123,7 +105,7 @@ pub async fn ledger_write_endpoint(
         "#service-0".parse().unwrap(),
         endpoint,
         OneOrList::List(vec![ServiceType::AIP1, ServiceType::DIDCommV1]),
-        sov_service_extras,
+        HashMap::new(),
     );
     let (_res, endpoint_attrib) = write_endpoint_from_service(
         wallet.as_ref(),

diff --git a/did_core/did_doc/src/schema/legacy.rs b/did_core/did_doc/src/schema/legacy.rs
@@ -10,8 +10,6 @@ use crate::schema::{
     verification_method::{VerificationMethod, VerificationMethodType},
 };
 
-// TODO: Remove defaults if it turns out they are not needed. Preserved based on the original
-// legacy DDO implementation.
 #[derive(Debug, Deserialize, Serialize, Clone, PartialEq, display_as_json::Display)]
 #[serde(deny_unknown_fields)]
 pub struct LegacyDidDoc {

diff --git a/did_core/did_doc/src/schema/service/mod.rs b/did_core/did_doc/src/schema/service/mod.rs
@@ -167,6 +167,7 @@ mod tests {
     use std::collections::HashMap;
 
     use did_parser::DidUrl;
+    use serde_json::json;
 
     use crate::schema::{
         service::{
@@ -198,13 +199,13 @@ mod tests {
 
     #[test]
     fn test_serde_service_aip1() {
-        let service_aip1: &str = r#"
-        {
+        let service_aip1 = json!({
             "id": "service-0",
             "type": "endpoint",
             "serviceEndpoint": "https://example.com/endpoint"
-        }"#;
-        let service = serde_json::from_str::<Service>(service_aip1).unwrap();
+        })
+        .to_string();
+        let service = serde_json::from_str::<Service>(&service_aip1).unwrap();
 
         assert_eq!(service.id().to_string(), "service-0");
         assert_eq!(
@@ -216,23 +217,17 @@ mod tests {
 
     #[test]
     fn test_serde_service_didcomm1() {
-        let service_didcomm1: &str = r#"
-        {
+        let service_didcomm1 = json!({
             "id": "service-0",
             "type": "did-communication",
             "priority": 0,
-            "recipientKeys": [
-                "did:sov:HR6vs6GEZ8rHaVgjg2WodM#key-agreement-1"
-            ],
-            "routingKeys": [
-                "did:sov:HR6vs6GEZ8rHaVgjg2WodM#key-agreement-2"
-            ],
-            "accept": [
-                "didcomm/aip2;env=rfc19"
-            ],
+            "recipientKeys": ["did:sov:HR6vs6GEZ8rHaVgjg2WodM#key-agreement-1"],
+            "routingKeys": [ "did:sov:HR6vs6GEZ8rHaVgjg2WodM#key-agreement-2"],
+            "accept": ["didcomm/aip2;env=rfc19"],
             "serviceEndpoint": "https://example.com/endpoint"
-        }"#;
-        let service = serde_json::from_str::<Service>(service_didcomm1).unwrap();
+        })
+        .to_string();
+        let service = serde_json::from_str::<Service>(&service_didcomm1).unwrap();
 
         assert_eq!(service.id().to_string(), "service-0");
         assert_eq!(
@@ -278,17 +273,15 @@ mod tests {
 
     #[test]
     fn test_serde_service_didcomm2() {
-        let service_didcomm2: &str = r#"
-        {
+        let service_didcomm2 = json!({
           "id": "service-0",
           "type": "DIDCommMessaging",
-          "accept": [
-            "didcomm/v2"
-          ],
+          "accept": [ "didcomm/v2"],
           "routingKeys": [],
           "serviceEndpoint": "https://example.com/endpoint"
-        }"#;
-        let service = serde_json::from_str::<Service>(service_didcomm2).unwrap();
+        })
+        .to_string();
+        let service = serde_json::from_str::<Service>(&service_didcomm2).unwrap();
 
         assert_eq!(service.id().to_string(), "service-0");
         assert_eq!(