Merge Conflicts

Signed-off-by: lli <[email protected]>
hyperledger · Jul 24, 2024 · 7d00707 · 7d00707
1 parent 7ba3781
commit 7d00707
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/did_core/did_methods/did_resolver_sov/src/resolution/utils.rs b/did_core/did_methods/did_resolver_sov/src/resolution/utils.rs
@@ -115,7 +115,7 @@ pub(super) async fn ledger_response_to_ddo(
         Default::default(),
     );
 
-    let expanded_verkey = expand_abbreviated_verkey(did, &verkey);
+    let expanded_verkey = expand_abbreviated_verkey(did, &verkey)?;
 
     // TODO: Use multibase instead of base58
     let verification_method = VerificationMethod::builder()
@@ -134,11 +134,8 @@ pub(super) async fn ledger_response_to_ddo(
 
     let ddo_metadata = {
         let mut metadata_builder = DidDocumentMetadata::builder().deactivated(false);
-        if let Ok(txn_time) = txn_time {
-            let datetime = unix_to_datetime(txn_time);
-            if let Some(datetime) = datetime {
-                metadata_builder = metadata_builder.updated(datetime);
-            };
+        if let Some(datetime) = datetime {
+            metadata_builder = metadata_builder.updated(datetime);
         }
         metadata_builder.build()
     };