Use extra fields from did_doc_sov in did_resolver_sov

Signed-off-by: Miroslav Kovar <miroslav.kovar@absa.africa>
hyperledger · Jun 7, 2023 · 95056f1 · 95056f1
1 parent acc3450
commit 95056f1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 98 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/did_resolver_sov/Cargo.toml b/did_resolver_sov/Cargo.toml
@@ -11,6 +11,7 @@ modular_libs = ["aries_vcx_core/modular_libs"]
 [dependencies]
 did_resolver = { path = "../did_resolver" }
 aries_vcx_core = { path = "../aries_vcx_core" }
+did_doc_sov = { path = "../did_doc_sov" }
 async-trait = "0.1.68"
 mockall = "0.11.4"
 serde_json = "1.0.96"

diff --git a/did_resolver_sov/src/resolution/extra_fields.rs b/did_resolver_sov/src/resolution/extra_fields.rs
diff --git a/did_resolver_sov/src/resolution/mod.rs b/did_resolver_sov/src/resolution/mod.rs
@@ -1,6 +1,4 @@
-mod extra_fields;
 mod resolver;
 mod utils;
 
-pub use extra_fields::ExtraFieldsSov;
 pub use resolver::DidSovResolver;
diff --git a/did_resolver_sov/src/resolution/resolver.rs b/did_resolver_sov/src/resolution/resolver.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
+use did_doc_sov::extra_fields::ExtraFields;
 use did_resolver::{
     did_parser::Did,
     error::GenericError,
@@ -17,10 +18,7 @@ use crate::{
     reader::AttrReader,
 };
 
-use super::{
-    utils::{is_valid_sovrin_did_id, ledger_response_to_ddo},
-    ExtraFieldsSov,
-};
+use super::utils::{is_valid_sovrin_did_id, ledger_response_to_ddo};
 
 pub struct DidSovResolver {
     ledger: Arc<dyn AttrReader>,
@@ -34,8 +32,7 @@ impl DidSovResolver {
 
 #[async_trait]
 impl DidResolvable for DidSovResolver {
-    // TODO: Change to ExtraFields from Sovrin-specific DDO wrapper
-    type ExtraFields = ();
+    type ExtraFields = ExtraFields;
 
     async fn resolve(
         &self,