Delete did_parser, use did_parser_nom instead (#1150)

Delete `did_parser`, use `did_parser_nom` instead (#1150) Signed-off-by: Patrik Stas <[email protected]>
hyperledger · Mar 17, 2024 · 80d294d · 80d294d
1 parent e8ebd99
commit 80d294d
Show file tree

Hide file tree

Showing 113 changed files with 152 additions and 1,188 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,6 @@ members = [
  "did_core/did_doc",
  "did_core/did_methods/did_peer",
  "did_core/did_methods/did_key",
- "did_core/did_parser",
  "did_core/did_parser_nom",
  "did_core/did_resolver",
  "did_core/did_resolver_registry",

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ The repository contains Rust crates to build
  - [`did_doc`](did_core/did_doc) - Building and parsing [DID Documents](https://w3c.github.io/did-core/)
 
 ## Did methods implementation
- - [`did_parser`](did_core/did_parser) - Building and parsing [DIDs](https://w3c.github.io/did-core/)
+ - [`did_parser`](did_core/did_parser_nom) - Building and parsing [DIDs](https://w3c.github.io/did-core/)
  - [`did_peer`](did_core/did_methods/did_peer) - https://identity.foundation/peer-did-method-spec/
  - [`did_sov`](did_core/did_methods/did_resolver_sov) - https://sovrin-foundation.github.io/sovrin/spec/did-method-spec-template.html
  - [`did_web`](did_core/did_methods/did_resolver_web) - https://w3c-ccg.github.io/did-method-web/

diff --git a/aries/agents/aath-backchannel/src/controllers/credential_definition.rs b/aries/agents/aath-backchannel/src/controllers/credential_definition.rs
@@ -4,7 +4,7 @@ use actix_web::{get, post, web, Responder};
 use anoncreds_types::data_types::identifiers::{
  cred_def_id::CredentialDefinitionId, schema_id::SchemaId,
 };
-use aries_vcx_agent::aries_vcx::did_parser::Did;
+use aries_vcx_agent::aries_vcx::did_parser_nom::Did;
 use reqwest::multipart;
 
 use crate::{

diff --git a/aries/agents/aath-backchannel/src/controllers/did_exchange.rs b/aries/agents/aath-backchannel/src/controllers/did_exchange.rs
@@ -2,7 +2,7 @@ use std::sync::RwLock;
 
 use actix_web::{get, post, web, Responder};
 use aries_vcx_agent::aries_vcx::{
- did_parser::Did,
+ did_parser_nom::Did,
  messages::{msg_fields::protocols::did_exchange::DidExchange, AriesMessage},
  protocols::did_exchange::state_machine::requester::helpers::invitation_get_first_did_service,
 };

diff --git a/aries/agents/aath-backchannel/src/error.rs b/aries/agents/aath-backchannel/src/error.rs
@@ -1,7 +1,7 @@
 use actix_web::{error, http::StatusCode, HttpResponse, HttpResponseBuilder};
 use aries_vcx_agent::{
  aries_vcx,
- aries_vcx::{did_parser::ParseError, messages::error::MsgTypeError},
+ aries_vcx::{did_parser_nom::ParseError, messages::error::MsgTypeError},
  AgentError,
 };
 use derive_more::{Display, Error};

diff --git a/aries/agents/aries-vcx-agent/src/agent/init.rs b/aries/agents/aries-vcx-agent/src/agent/init.rs
@@ -6,7 +6,7 @@ use aries_vcx::{
  transactions::{add_new_did, write_endpoint},
  },
  did_doc::schema::service::typed::ServiceType,
- did_parser::Did,
+ did_parser_nom::Did,
  global::settings::DEFAULT_LINK_SECRET_ALIAS,
 };
 use aries_vcx_core::{

diff --git a/aries/agents/aries-vcx-agent/src/error/convertors.rs b/aries/agents/aries-vcx-agent/src/error/convertors.rs
@@ -46,8 +46,8 @@ impl From<DidDocumentBuilderError> for AgentError {
  }
 }
 
-impl From<aries_vcx::did_parser::ParseError> for AgentError {
- fn from(err: aries_vcx::did_parser::ParseError) -> Self {
+impl From<aries_vcx::did_parser_nom::ParseError> for AgentError {
+ fn from(err: aries_vcx::did_parser_nom::ParseError) -> Self {
  let kind = AgentErrorKind::GenericAriesVcxError;
  let message = format!("DidParseError; err: {:?}", err.to_string());
  AgentError { message, kind }

diff --git a/aries/agents/aries-vcx-agent/src/handlers/credential_definition.rs b/aries/agents/aries-vcx-agent/src/handlers/credential_definition.rs
@@ -1,7 +1,7 @@
 use std::sync::{Arc, Mutex};
 
 use anoncreds_types::data_types::identifiers::schema_id::SchemaId;
-use aries_vcx::{common::primitives::credential_definition::CredentialDef, did_parser::Did};
+use aries_vcx::{common::primitives::credential_definition::CredentialDef, did_parser_nom::Did};
 use aries_vcx_core::{
  anoncreds::credx_anoncreds::IndyCredxAnonCreds,
  ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},

diff --git a/aries/agents/aries-vcx-agent/src/handlers/did_exchange.rs b/aries/agents/aries-vcx-agent/src/handlers/did_exchange.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use aries_vcx::{
  did_doc::schema::{service::typed::ServiceType, types::uri::Uri},
- did_parser::Did,
+ did_parser_nom::Did,
  messages::{
  msg_fields::protocols::{
  did_exchange::{

diff --git a/aries/agents/aries-vcx-agent/src/handlers/holder.rs b/aries/agents/aries-vcx-agent/src/handlers/holder.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use aries_vcx::{
- did_parser::Did,
+ did_parser_nom::Did,
  handlers::issuance::holder::Holder,
  messages::{
  msg_fields::protocols::cred_issuance::v1::{

diff --git a/aries/agents/aries-vcx-agent/src/handlers/revocation_registry.rs b/aries/agents/aries-vcx-agent/src/handlers/revocation_registry.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use anoncreds_types::data_types::identifiers::cred_def_id::CredentialDefinitionId;
-use aries_vcx::{common::primitives::revocation_registry::RevocationRegistry, did_parser::Did};
+use aries_vcx::{common::primitives::revocation_registry::RevocationRegistry, did_parser_nom::Did};
 use aries_vcx_core::{
  anoncreds::credx_anoncreds::IndyCredxAnonCreds,
  ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},

diff --git a/aries/agents/aries-vcx-agent/src/handlers/schema.rs b/aries/agents/aries-vcx-agent/src/handlers/schema.rs
@@ -1,6 +1,6 @@
 use std::sync::{Arc, Mutex};
 
-use aries_vcx::{common::primitives::credential_schema::Schema, did_parser::Did};
+use aries_vcx::{common::primitives::credential_schema::Schema, did_parser_nom::Did};
 use aries_vcx_core::{
  anoncreds::credx_anoncreds::IndyCredxAnonCreds,
  ledger::{

diff --git a/aries/aries_vcx/Cargo.toml b/aries/aries_vcx/Cargo.toml
@@ -43,7 +43,7 @@ diddoc_legacy = { path = "../misc/legacy/diddoc_legacy" }
 aries_vcx_core = { path = "../aries_vcx_core" }
 shared = { path = "../misc/shared" }
 anoncreds_types = { path = "../misc/anoncreds_types" }
-did_parser = { path = "../../did_core/did_parser" }
+did_parser_nom = { path = "../../did_core/did_parser_nom" }
 did_resolver = { path = "../../did_core/did_resolver" }
 did_doc = { path = "../../did_core/did_doc" }
 did_key = { path = "../../did_core/did_methods/did_key" }

diff --git a/aries/aries_vcx/src/common/keys.rs b/aries/aries_vcx/src/common/keys.rs
@@ -2,7 +2,7 @@ use aries_vcx_core::{
  ledger::base_ledger::{IndyLedgerRead, IndyLedgerWrite},
  wallet::base_wallet::BaseWallet,
 };
-use did_parser::Did;
+use did_parser_nom::Did;
 use public_key::{Key, KeyType};
 use serde_json::Value;
 

diff --git a/aries/aries_vcx/src/common/ledger/transactions.rs b/aries/aries_vcx/src/common/ledger/transactions.rs
@@ -8,7 +8,7 @@ use aries_vcx_core::{
  wallet::base_wallet::BaseWallet,
 };
 use did_doc::schema::service::Service;
-use did_parser::Did;
+use did_parser_nom::Did;
 use diddoc_legacy::aries::service::AriesService;
 use messages::msg_fields::protocols::out_of_band::invitation::OobService;
 use public_key::{Key, KeyType};

diff --git a/aries/aries_vcx/src/common/primitives/credential_definition.rs b/aries/aries_vcx/src/common/primitives/credential_definition.rs
@@ -13,7 +13,7 @@ use aries_vcx_core::{
  ledger::base_ledger::{AnoncredsLedgerRead, AnoncredsLedgerWrite},
  wallet::base_wallet::BaseWallet,
 };
-use did_parser::Did;
+use did_parser_nom::Did;
 
 use crate::{
  errors::error::{AriesVcxError, AriesVcxErrorKind, VcxResult},

diff --git a/aries/aries_vcx/src/common/primitives/credential_schema.rs b/aries/aries_vcx/src/common/primitives/credential_schema.rs
@@ -5,7 +5,7 @@ use aries_vcx_core::{
  anoncreds::base_anoncreds::BaseAnonCreds, global::settings::DEFAULT_SERIALIZE_VERSION,
  ledger::base_ledger::AnoncredsLedgerWrite, wallet::base_wallet::BaseWallet,
 };
-use did_parser::Did;
+use did_parser_nom::Did;
 
 use super::credential_definition::PublicEntityStateType;
 use crate::{

diff --git a/aries/aries_vcx/src/common/primitives/revocation_registry.rs b/aries/aries_vcx/src/common/primitives/revocation_registry.rs
@@ -10,7 +10,7 @@ use aries_vcx_core::{
  ledger::base_ledger::{AnoncredsLedgerRead, AnoncredsLedgerWrite},
  wallet::base_wallet::BaseWallet,
 };
-use did_parser::Did;
+use did_parser_nom::Did;
 
 use super::credential_definition::PublicEntityStateType;
 use crate::errors::error::{AriesVcxError, AriesVcxErrorKind, VcxResult};

diff --git a/aries/aries_vcx/src/errors/mapping_others.rs b/aries/aries_vcx/src/errors/mapping_others.rs
@@ -34,8 +34,8 @@ impl From<HttpError> for AriesVcxError {
  }
 }
 
-impl From<did_parser::ParseError> for AriesVcxError {
- fn from(err: did_parser::ParseError) -> Self {
+impl From<did_parser_nom::ParseError> for AriesVcxError {
+ fn from(err: did_parser_nom::ParseError) -> Self {
  AriesVcxError::from_msg(AriesVcxErrorKind::InvalidState, err.to_string())
  }
 }

diff --git a/aries/aries_vcx/src/handlers/issuance/holder.rs b/aries/aries_vcx/src/handlers/issuance/holder.rs
@@ -3,7 +3,7 @@ use aries_vcx_core::{
  wallet::base_wallet::BaseWallet,
 };
 use chrono::Utc;
-use did_parser::Did;
+use did_parser_nom::Did;
 use messages::{
  decorators::{thread::Thread, timing::Timing},
  msg_fields::protocols::{

diff --git a/aries/aries_vcx/src/lib.rs b/aries/aries_vcx/src/lib.rs
@@ -21,7 +21,7 @@ extern crate derive_builder;
 
 pub extern crate aries_vcx_core;
 pub extern crate did_doc;
-pub extern crate did_parser;
+pub extern crate did_parser_nom;
 pub extern crate did_peer;
 pub extern crate messages;
 

diff --git a/aries/aries_vcx/src/protocols/did_exchange/mod.rs b/aries/aries_vcx/src/protocols/did_exchange/mod.rs
@@ -4,7 +4,7 @@ use did_doc::schema::{
  did_doc::DidDocument,
  verification_method::{VerificationMethod, VerificationMethodKind},
 };
-use did_parser::DidUrl;
+use did_parser_nom::DidUrl;
 use did_resolver_registry::ResolverRegistry;
 use messages::msg_fields::protocols::out_of_band::invitation::{
  Invitation as OobInvitation, OobService,

diff --git a/aries/aries_vcx/src/protocols/did_exchange/state_machine/generic/mod.rs b/aries/aries_vcx/src/protocols/did_exchange/state_machine/generic/mod.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use did_doc::schema::did_doc::DidDocument;
-use did_parser::Did;
+use did_parser_nom::Did;
 use did_peer::peer_did::{numalgos::numalgo2::Numalgo2, PeerDid};
 use did_resolver_registry::ResolverRegistry;
 use messages::msg_fields::protocols::did_exchange::{

diff --git a/aries/aries_vcx/src/protocols/did_exchange/state_machine/helpers.rs b/aries/aries_vcx/src/protocols/did_exchange/state_machine/helpers.rs
@@ -10,7 +10,7 @@ use did_doc::schema::{
  verification_method::{VerificationMethod, VerificationMethodType},
 };
 use did_key::DidKey;
-use did_parser::{Did, DidUrl};
+use did_parser_nom::{Did, DidUrl};
 use did_peer::peer_did::{numalgos::numalgo2::Numalgo2, PeerDid};
 use messages::{
  decorators::{

diff --git a/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/helpers.rs b/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/helpers.rs
@@ -1,5 +1,5 @@
 use chrono::Utc;
-use did_parser::Did;
+use did_parser_nom::Did;
 use messages::{
  decorators::{
  thread::{Thread, ThreadGoalCode},

diff --git a/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/request_sent/mod.rs b/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/request_sent/mod.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use did_parser::Did;
+use did_parser_nom::Did;
 use did_peer::{
  peer_did::{numalgos::numalgo2::Numalgo2, PeerDid},
  resolver::options::PublicKeyEncoding,

diff --git a/aries/aries_vcx/src/protocols/issuance/holder/state_machine.rs b/aries/aries_vcx/src/protocols/issuance/holder/state_machine.rs
@@ -5,7 +5,7 @@ use aries_vcx_core::{
  wallet::base_wallet::BaseWallet,
 };
 use chrono::Utc;
-use did_parser::Did;
+use did_parser_nom::Did;
 use messages::{
  decorators::{thread::Thread, timing::Timing},
  msg_fields::protocols::{

diff --git a/aries/aries_vcx/tests/test_did_exchange.rs b/aries/aries_vcx/tests/test_did_exchange.rs
@@ -22,7 +22,7 @@ use did_doc::schema::{
  service::typed::{didcommv1::ServiceDidCommV1, ServiceType},
  types::uri::Uri,
 };
-use did_parser::Did;
+use did_parser_nom::Did;
 use did_peer::{
  peer_did::{numalgos::numalgo2::Numalgo2, PeerDid},
  resolver::{options::PublicKeyEncoding, PeerDidResolutionOptions, PeerDidResolver},

diff --git a/aries/aries_vcx/tests/test_pool.rs b/aries/aries_vcx/tests/test_pool.rs
@@ -29,7 +29,7 @@ use aries_vcx_core::{
  },
  wallet::base_wallet::{did_wallet::DidWallet, BaseWallet},
 };
-use did_parser::Did;
+use did_parser_nom::Did;
 use diddoc_legacy::aries::service::AriesService;
 use serde_json::json;
 use test_utils::{

diff --git a/aries/aries_vcx/tests/test_verifier.rs b/aries/aries_vcx/tests/test_verifier.rs
@@ -24,7 +24,7 @@ use aries_vcx_core::{
  ledger::base_ledger::{AnoncredsLedgerRead, AnoncredsLedgerWrite},
  wallet::base_wallet::BaseWallet,
 };
-use did_parser::Did;
+use did_parser_nom::Did;
 use serde_json::json;
 use test_utils::{constants::DEFAULT_SCHEMA_ATTRS, devsetup::build_setup_profile};
 

diff --git a/aries/aries_vcx/tests/utils/mod.rs b/aries/aries_vcx/tests/utils/mod.rs
@@ -23,7 +23,7 @@ use aries_vcx_core::{
  },
  wallet::base_wallet::BaseWallet,
 };
-use did_parser::Did;
+use did_parser_nom::Did;
 use test_utils::{
  constants::TEST_TAILS_URL,
  random::{generate_random_schema_name, generate_random_schema_version},

diff --git a/aries/aries_vcx/tests/utils/scenarios/credential_issuance.rs b/aries/aries_vcx/tests/utils/scenarios/credential_issuance.rs
@@ -24,7 +24,7 @@ use aries_vcx_core::{
  },
  wallet::base_wallet::BaseWallet,
 };
-use did_parser::Did;
+use did_parser_nom::Did;
 use messages::msg_fields::protocols::{
  cred_issuance::v1::{
  offer_credential::OfferCredentialV1, propose_credential::ProposeCredentialV1,