Merge branch 'main' into feature/vdr-proxy-client

Signed-off-by: Miroslav Kovar <miroslav.kovar@absa.africa> # Conflicts: # .github/workflows/main.yml
hyperledger · May 17, 2023 · 6f29f05 · 6f29f05
2 parents 6f32cf7 + 3072394
commit 6f29f05
Show file tree

Hide file tree

Showing 89 changed files with 77 additions and 77 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -503,7 +503,7 @@ jobs:
         uses: ./.github/actions/setup-testing-rust
       - name: "Run resolver tests"
         run: |
-          RUST_TEST_THREADS=1 cargo test -p did_doc_builder -p did_parser -p did_resolver -p did_resolver_registry -p did_resolver_sov --test "*"
+          RUST_TEST_THREADS=1 cargo test -p did_doc -p did_parser -p did_resolver -p did_resolver_registry -p did_resolver_sov -p did_resolver_web --test "*"
 
   test-node-wrapper:
     needs: workflow-setup

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,12 +8,12 @@ members = [
     "messages_macros",
     "messages",
     "shared_vcx",
-    "diddoc",
+    "diddoc_legacy",
     "agents/rust/aries-vcx-agent",
     "wrappers/vcx-napi-rs",
     "aries_vcx_core",
     "uniffi_aries_vcx/core",
-    "did_doc_builder",
+    "did_doc",
     "did_parser",
     "did_resolver",
     "did_resolver_registry",

diff --git a/aries_vcx/Cargo.toml b/aries_vcx/Cargo.toml
@@ -20,7 +20,7 @@ vdr_proxy_ledger = ["aries_vcx_core/vdr_proxy_ledger"]
 [dependencies]
 agency_client = { path = "../agency_client" }
 messages = { path  = "../messages" }
-diddoc = { path = "../diddoc" }
+diddoc_legacy = { path = "../diddoc_legacy" }
 aries_vcx_core = { path  = "../aries_vcx_core" }
 shared_vcx = { path = "../shared_vcx" }
 bs58 = "0.4.0"

diff --git a/aries_vcx/src/common/ledger/service_didsov.rs b/aries_vcx/src/common/ledger/service_didsov.rs
@@ -63,7 +63,7 @@ impl Default for EndpointDidSov {
 #[cfg(test)]
 #[allow(clippy::unwrap_used)]
 mod unit_tests {
-    use diddoc::aries::diddoc::test_utils::{_routing_keys, _service_endpoint};
+    use diddoc_legacy::aries::diddoc::test_utils::{_routing_keys, _service_endpoint};
 
     use crate::common::ledger::service_didsov::{DidSovServiceType, EndpointDidSov};
     use crate::utils::devsetup::SetupEmpty;

diff --git a/aries_vcx/src/common/ledger/transactions.rs b/aries_vcx/src/common/ledger/transactions.rs
@@ -1,6 +1,6 @@
 use bs58;
-use diddoc::aries::diddoc::AriesDidDoc;
-use diddoc::aries::service::AriesService;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::service::AriesService;
 use messages::msg_fields::protocols::connection::invitation::Invitation;
 use messages::msg_fields::protocols::out_of_band::invitation::OobService;
 use std::{collections::HashMap, sync::Arc};

diff --git a/aries_vcx/src/common/signing.rs b/aries_vcx/src/common/signing.rs
@@ -103,7 +103,7 @@ pub async fn unpack_message_to_string(wallet: &Arc<dyn BaseWallet>, msg: &[u8])
 //     use crate::utils::devsetup::SetupEmpty;
 //     use aries_vcx_core::indy::utils::test_setup::with_wallet;
 //     use aries_vcx_core::INVALID_POOL_HANDLE;
-//     use diddoc::aries::diddoc::test_utils::*;
+//     use diddoc_legacy::aries::diddoc::test_utils::*;
 //     use messages::protocols::connection::response::test_utils::{_did, _response, _thread_id};
 
 //     use super::*;

diff --git a/aries_vcx/src/errors/mapping_diddoc.rs b/aries_vcx/src/errors/mapping_diddoc.rs
@@ -1,5 +1,5 @@
 use crate::errors::error::{AriesVcxError, AriesVcxErrorKind};
-use diddoc::errors::error::{DiddocError, DiddocErrorKind};
+use diddoc_legacy::errors::error::{DiddocError, DiddocErrorKind};
 
 impl From<DiddocError> for AriesVcxError {
     fn from(msg_err: DiddocError) -> AriesVcxError {

diff --git a/aries_vcx/src/handlers/connection/mediated_connection.rs b/aries_vcx/src/handlers/connection/mediated_connection.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use chrono::Utc;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use futures::future::BoxFuture;
 use futures::stream::StreamExt;
 use messages::decorators::timing::Timing;

diff --git a/aries_vcx/src/handlers/discovery/mod.rs b/aries_vcx/src/handlers/discovery/mod.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use crate::errors::error::VcxResult;
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use chrono::Utc;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::decorators::thread::Thread;
 use messages::decorators::timing::Timing;
 use messages::msg_fields::protocols::discover_features::disclose::{Disclose, DiscloseContent, DiscloseDecorators};

diff --git a/aries_vcx/src/handlers/out_of_band/receiver.rs b/aries_vcx/src/handlers/out_of_band/receiver.rs
@@ -3,7 +3,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use agency_client::agency_client::AgencyClient;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::decorators::attachment::AttachmentType;
 use messages::decorators::thread::Thread;
 use messages::msg_fields::protocols::cred_issuance::issue_credential::IssueCredential;

diff --git a/aries_vcx/src/protocols/connection/generic/mod.rs b/aries_vcx/src/protocols/connection/generic/mod.rs
@@ -4,7 +4,7 @@ mod thin_state;
 use std::sync::Arc;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::AriesMessage;
 
 pub use self::thin_state::{State, ThinState};

diff --git a/aries_vcx/src/protocols/connection/invitee/mod.rs b/aries_vcx/src/protocols/connection/invitee/mod.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use chrono::Utc;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::{
     decorators::{thread::Thread, timing::Timing},
     msg_fields::protocols::{

diff --git a/aries_vcx/src/protocols/connection/invitee/states/completed.rs b/aries_vcx/src/protocols/connection/invitee/states/completed.rs
@@ -1,6 +1,6 @@
 use std::clone::Clone;
 
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::discover_features::{disclose::Disclose, ProtocolDescriptor};
 
 use crate::protocols::connection::trait_bounds::{BootstrapDidDoc, CompletedState, TheirDidDoc, ThreadId};

diff --git a/aries_vcx/src/protocols/connection/invitee/states/invited.rs b/aries_vcx/src/protocols/connection/invitee/states/invited.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::connection::invitation::Invitation;
 
 use crate::{

diff --git a/aries_vcx/src/protocols/connection/invitee/states/requested.rs b/aries_vcx/src/protocols/connection/invitee/states/requested.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 
 use crate::protocols::connection::trait_bounds::{BootstrapDidDoc, HandleProblem, TheirDidDoc, ThreadId};
 

diff --git a/aries_vcx/src/protocols/connection/invitee/states/responded.rs b/aries_vcx/src/protocols/connection/invitee/states/responded.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 
 use crate::protocols::connection::trait_bounds::{BootstrapDidDoc, TheirDidDoc, ThreadId};
 

diff --git a/aries_vcx/src/protocols/connection/inviter/mod.rs b/aries_vcx/src/protocols/connection/inviter/mod.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use ::uuid::Uuid;
 use chrono::Utc;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::decorators::thread::Thread;
 use messages::decorators::timing::Timing;
 use messages::msg_fields::protocols::connection::invitation::{

diff --git a/aries_vcx/src/protocols/connection/inviter/states/completed.rs b/aries_vcx/src/protocols/connection/inviter/states/completed.rs
@@ -1,6 +1,6 @@
 use std::clone::Clone;
 
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::discover_features::{disclose::Disclose, ProtocolDescriptor};
 
 use crate::protocols::connection::trait_bounds::{CompletedState, TheirDidDoc, ThreadId};

diff --git a/aries_vcx/src/protocols/connection/inviter/states/requested.rs b/aries_vcx/src/protocols/connection/inviter/states/requested.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::connection::response::Response;
 
 use crate::protocols::connection::trait_bounds::{TheirDidDoc, ThreadId};

diff --git a/aries_vcx/src/protocols/connection/inviter/states/responded.rs b/aries_vcx/src/protocols/connection/inviter/states/responded.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 
 use crate::protocols::connection::trait_bounds::{TheirDidDoc, ThreadId};
 

diff --git a/aries_vcx/src/protocols/connection/mod.rs b/aries_vcx/src/protocols/connection/mod.rs
@@ -8,7 +8,7 @@ mod trait_bounds;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use chrono::Utc;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::{
     decorators::{thread::Thread, timing::Timing},
     msg_fields::protocols::{

diff --git a/aries_vcx/src/protocols/connection/trait_bounds.rs b/aries_vcx/src/protocols/connection/trait_bounds.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::discover_features::{disclose::Disclose, ProtocolDescriptor};
 
 /// Trait implemented for [`super::Connection`] states that store an [`AriesDidDoc`].

diff --git a/aries_vcx/src/protocols/mediated_connection/invitee/state_machine.rs b/aries_vcx/src/protocols/mediated_connection/invitee/state_machine.rs
@@ -14,7 +14,7 @@ use crate::protocols::mediated_connection::pairwise_info::PairwiseInfo;
 use crate::protocols::SendClosureConnection;
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use chrono::Utc;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::decorators::thread::Thread;
 use messages::decorators::timing::Timing;
 use messages::msg_fields::protocols::connection::invitation::Invitation;

diff --git a/aries_vcx/src/protocols/mediated_connection/invitee/states/completed.rs b/aries_vcx/src/protocols/mediated_connection/invitee/states/completed.rs
@@ -2,7 +2,7 @@ use std::clone::Clone;
 
 use crate::protocols::mediated_connection::invitee::states::requested::RequestedState;
 use crate::protocols::mediated_connection::invitee::states::responded::RespondedState;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::connection::response::Response;
 use messages::msg_fields::protocols::discover_features::ProtocolDescriptor;
 

diff --git a/aries_vcx/src/protocols/mediated_connection/invitee/states/initial.rs b/aries_vcx/src/protocols/mediated_connection/invitee/states/initial.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::connection::problem_report::ProblemReport;
 
 use crate::{handlers::util::AnyInvitation, protocols::mediated_connection::invitee::states::invited::InvitedState};

diff --git a/aries_vcx/src/protocols/mediated_connection/invitee/states/invited.rs b/aries_vcx/src/protocols/mediated_connection/invitee/states/invited.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::connection::request::Request;
 
 use crate::handlers::util::AnyInvitation;

diff --git a/aries_vcx/src/protocols/mediated_connection/invitee/states/requested.rs b/aries_vcx/src/protocols/mediated_connection/invitee/states/requested.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::connection::problem_report::ProblemReport;
 use messages::msg_fields::protocols::connection::request::Request;
 use messages::msg_fields::protocols::connection::ConnectionData;

diff --git a/aries_vcx/src/protocols/mediated_connection/invitee/states/responded.rs b/aries_vcx/src/protocols/mediated_connection/invitee/states/responded.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::connection::{problem_report::ProblemReport, request::Request, ConnectionData};
 
 use crate::protocols::mediated_connection::invitee::states::initial::InitialState;

diff --git a/aries_vcx/src/protocols/mediated_connection/inviter/state_machine.rs b/aries_vcx/src/protocols/mediated_connection/inviter/state_machine.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use chrono::Utc;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::decorators::thread::Thread;
 use messages::decorators::timing::Timing;
 use messages::msg_fields::protocols::connection::invitation::{

diff --git a/aries_vcx/src/protocols/mediated_connection/inviter/states/completed.rs b/aries_vcx/src/protocols/mediated_connection/inviter/states/completed.rs
@@ -1,6 +1,6 @@
 use std::clone::Clone;
 
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::discover_features::ProtocolDescriptor;
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]

diff --git a/aries_vcx/src/protocols/mediated_connection/inviter/states/requested.rs b/aries_vcx/src/protocols/mediated_connection/inviter/states/requested.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::connection::problem_report::ProblemReport;
 use messages::msg_fields::protocols::connection::response::Response;
 

diff --git a/aries_vcx/src/protocols/mediated_connection/inviter/states/responded.rs b/aries_vcx/src/protocols/mediated_connection/inviter/states/responded.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use messages::msg_fields::protocols::connection::problem_report::ProblemReport;
 use messages::msg_fields::protocols::connection::response::Response;
 

diff --git a/aries_vcx/src/protocols/mod.rs b/aries_vcx/src/protocols/mod.rs
@@ -1,4 +1,4 @@
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use futures::future::BoxFuture;
 use messages::AriesMessage;
 

diff --git a/aries_vcx/src/utils/encryption_envelope.rs b/aries_vcx/src/utils/encryption_envelope.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use futures::TryFutureExt;
 
 use agency_client::testing::mocking::AgencyMockDecrypted;

diff --git a/aries_vcx/src/utils/mod.rs b/aries_vcx/src/utils/mod.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
-use diddoc::aries::diddoc::AriesDidDoc;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
 
 use crate::errors::error::{AriesVcxError, AriesVcxErrorKind, VcxResult};
 use crate::utils::encryption_envelope::EncryptionEnvelope;

diff --git a/aries_vcx/tests/test_pool.rs b/aries_vcx/tests/test_pool.rs
@@ -15,7 +15,7 @@ mod integration_tests {
     use aries_vcx::common::test_utils::create_and_store_nonrevocable_credential_def;
     use aries_vcx::utils::constants::DEFAULT_SCHEMA_ATTRS;
     use aries_vcx::utils::devsetup::{SetupProfile, SetupWalletPool};
-    use diddoc::aries::service::AriesService;
+    use diddoc_legacy::aries::service::AriesService;
     use std::sync::Arc;
     use std::thread;
     use std::time::Duration;

diff --git a/aries_vcx/tests/utils/devsetup_agent.rs b/aries_vcx/tests/utils/devsetup_agent.rs
@@ -20,7 +20,7 @@ pub mod test_utils {
     use aries_vcx_core::wallet::base_wallet::BaseWallet;
     use aries_vcx_core::wallet::indy_wallet::IndySdkWallet;
     use aries_vcx_core::{PoolHandle, WalletHandle};
-    use diddoc::aries::service::AriesService;
+    use diddoc_legacy::aries::service::AriesService;
     use futures::future::BoxFuture;
 
     use agency_client::agency_client::AgencyClient;

diff --git a/aries_vcx/tests/utils/scenarios.rs b/aries_vcx/tests/utils/scenarios.rs
@@ -9,7 +9,7 @@ pub mod test_utils {
     use aries_vcx::handlers::util::{AnyInvitation, OfferInfo, PresentationProposalData};
     use aries_vcx::protocols::SendClosureConnection;
     use async_channel::{bounded, Sender};
-    use diddoc::aries::diddoc::AriesDidDoc;
+    use diddoc_legacy::aries::diddoc::AriesDidDoc;
     use messages::misc::MimeType;
     use messages::msg_fields::protocols::connection::request::Request;
     use messages::msg_fields::protocols::connection::Connection;

diff --git a/did_doc_builder/Cargo.lock → did_doc/Cargo.lock b/did_doc_builder/Cargo.lock → did_doc/Cargo.lock
diff --git a/did_doc_builder/Cargo.toml → did_doc/Cargo.toml b/did_doc_builder/Cargo.toml → did_doc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "did_doc_builder"
+name = "did_doc"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/did_doc_builder/rustfmt.toml → did_doc/rustfmt.toml b/did_doc_builder/rustfmt.toml → did_doc/rustfmt.toml
diff --git a/did_doc_builder/src/error.rs → did_doc/src/error.rs b/did_doc_builder/src/error.rs → did_doc/src/error.rs
diff --git a/did_doc_builder/src/lib.rs → did_doc/src/lib.rs b/did_doc_builder/src/lib.rs → did_doc/src/lib.rs
diff --git a/did_doc_builder/src/schema/did_doc.rs → did_doc/src/schema/did_doc.rs b/did_doc_builder/src/schema/did_doc.rs → did_doc/src/schema/did_doc.rs
diff --git a/did_doc_builder/src/schema/mod.rs → did_doc/src/schema/mod.rs b/did_doc_builder/src/schema/mod.rs → did_doc/src/schema/mod.rs
diff --git a/did_doc_builder/src/schema/service.rs → did_doc/src/schema/service.rs b/did_doc_builder/src/schema/service.rs → did_doc/src/schema/service.rs
diff --git a/...oc_builder/src/schema/types/jsonwebkey.rs → did_doc/src/schema/types/jsonwebkey.rs b/...oc_builder/src/schema/types/jsonwebkey.rs → did_doc/src/schema/types/jsonwebkey.rs
diff --git a/did_doc_builder/src/schema/types/mod.rs → did_doc/src/schema/types/mod.rs b/did_doc_builder/src/schema/types/mod.rs → did_doc/src/schema/types/mod.rs
diff --git a/...doc_builder/src/schema/types/multibase.rs → did_doc/src/schema/types/multibase.rs b/...doc_builder/src/schema/types/multibase.rs → did_doc/src/schema/types/multibase.rs
diff --git a/did_doc_builder/src/schema/types/uri.rs → did_doc/src/schema/types/uri.rs b/did_doc_builder/src/schema/types/uri.rs → did_doc/src/schema/types/uri.rs
diff --git a/did_doc_builder/src/schema/types/url.rs → did_doc/src/schema/types/url.rs b/did_doc_builder/src/schema/types/url.rs → did_doc/src/schema/types/url.rs
diff --git a/did_doc_builder/src/schema/utils/mod.rs → did_doc/src/schema/utils/mod.rs b/did_doc_builder/src/schema/utils/mod.rs → did_doc/src/schema/utils/mod.rs
diff --git a/...builder/src/schema/verification_method.rs → did_doc/src/schema/verification_method.rs b/...builder/src/schema/verification_method.rs → did_doc/src/schema/verification_method.rs
diff --git a/did_doc_builder/tests/serde.rs → did_doc/tests/serde.rs b/did_doc_builder/tests/serde.rs → did_doc/tests/serde.rs
@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use did_doc_builder::schema::{
+use did_doc::schema::{
     did_doc::DidDocument,
     types::{jsonwebkey::JsonWebKey, uri::Uri},
     verification_method::{VerificationMethod, VerificationMethodKind},