From 7d00707b7afc538b93c19fd3de4931eb40bf894d Mon Sep 17 00:00:00 2001 From: lli Date: Tue, 23 Jul 2024 17:03:57 -0700 Subject: [PATCH] Merge Conflicts Signed-off-by: lli --- .../did_methods/did_resolver_sov/src/resolution/utils.rs | 9 +++------ 1 file changed, 3 insertions(+), 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 index 82e4d2f4b0..75a0417b13 100644 --- 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() };