refactor: move ledger to a separate crate

Signed-off-by: Ondrej Prazak <ondrej.prazak@absa.africa>
hyperledger · Apr 4, 2024 · 7ced0f0 · 7ced0f0
1 parent d0ad7a6
commit 7ced0f0
Show file tree

Hide file tree

Showing 107 changed files with 558 additions and 415 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,6 +15,7 @@ members = [
  "aries/wrappers/uniffi-aries-vcx/core",
  "aries/aries_vcx_core",
  "aries/aries_vcx_wallet",
+ "aries/aries_vcx_ledger",
  "aries/misc/indy_ledger_response_parser",
  "aries/misc/wallet_migrator",
  "aries/misc/test_utils",

diff --git a/aries/agents/aries-vcx-agent/Cargo.toml b/aries/agents/aries-vcx-agent/Cargo.toml
@@ -15,6 +15,7 @@ aries_vcx_core = { path = "../../aries_vcx_core", features = [
 aries_vcx_wallet = { path = "../../aries_vcx_wallet", features = [
  "vdrtools_wallet",
 ] }
+aries_vcx_ledger = { path = "../../aries_vcx_ledger"}
 anoncreds_types = { path = "../../misc/anoncreds_types" }
 shared = { path = "../../misc/shared" }
 did_resolver_registry = { path = "../../../did_core/did_resolver_registry" }

diff --git a/aries/agents/aries-vcx-agent/src/agent/agent_struct.rs b/aries/agents/aries-vcx-agent/src/agent/agent_struct.rs
@@ -1,9 +1,7 @@
 use std::sync::Arc;
 
-use aries_vcx_core::{
- anoncreds::credx_anoncreds::IndyCredxAnonCreds,
- ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},
-};
+use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_ledger::ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
 use crate::handlers::{

diff --git a/aries/agents/aries-vcx-agent/src/agent/init.rs b/aries/agents/aries-vcx-agent/src/agent/init.rs
@@ -12,7 +12,9 @@ use aries_vcx::{
 use aries_vcx_core::{
  self,
  anoncreds::{base_anoncreds::BaseAnonCreds, credx_anoncreds::IndyCredxAnonCreds},
- ledger::indy_vdr_ledger::{build_ledger_components, DefaultIndyLedgerRead, VcxPoolConfig},
+};
+use aries_vcx_ledger::ledger::indy_vdr_ledger::{
+ build_ledger_components, DefaultIndyLedgerRead, VcxPoolConfig,
 };
 use aries_vcx_wallet::wallet::{
  base_wallet::{issuer_config::IssuerConfig, BaseWallet, ManageWallet},

diff --git a/aries/agents/aries-vcx-agent/src/error/convertors.rs b/aries/agents/aries-vcx-agent/src/error/convertors.rs
@@ -6,6 +6,7 @@ use aries_vcx::{
  protocols::did_exchange::state_machine::generic::GenericDidExchange,
 };
 use aries_vcx_core::errors::error::AriesVcxCoreError;
+use aries_vcx_ledger::errors::error::VcxLedgerError;
 use did_resolver_sov::did_resolver::did_doc::schema::utils::error::DidDocumentLookupError;
 
 use crate::error::*;
@@ -38,6 +39,14 @@ impl From<AriesVcxCoreError> for AgentError {
  }
 }
 
+impl From<VcxLedgerError> for AgentError {
+ fn from(err: VcxLedgerError) -> Self {
+ let kind = AgentErrorKind::GenericAriesVcxError;
+ let message = format!("VcxLedgerCore Error; err: {:?}", err.to_string());
+ AgentError { message, kind }
+ }
+}
+
 impl From<DidDocumentBuilderError> for AgentError {
  fn from(err: DidDocumentBuilderError) -> Self {
  let kind = AgentErrorKind::GenericAriesVcxError;

diff --git a/aries/agents/aries-vcx-agent/src/handlers/connection.rs b/aries/agents/aries-vcx-agent/src/handlers/connection.rs
@@ -13,7 +13,7 @@ use aries_vcx::{
  pairwise_info::PairwiseInfo, Connection, GenericConnection, State, ThinState,
  },
 };
-use aries_vcx_core::ledger::indy_vdr_ledger::DefaultIndyLedgerRead;
+use aries_vcx_ledger::ledger::indy_vdr_ledger::DefaultIndyLedgerRead;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 use url::Url;
 

diff --git a/aries/agents/aries-vcx-agent/src/handlers/credential_definition.rs b/aries/agents/aries-vcx-agent/src/handlers/credential_definition.rs
@@ -2,10 +2,8 @@ use std::sync::{Arc, Mutex};
 
 use anoncreds_types::data_types::identifiers::schema_id::SchemaId;
 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},
-};
+use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_ledger::ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
 use crate::{

diff --git a/aries/agents/aries-vcx-agent/src/handlers/holder.rs b/aries/agents/aries-vcx-agent/src/handlers/holder.rs
@@ -12,9 +12,8 @@ use aries_vcx::{
  },
  protocols::{issuance::holder::state_machine::HolderState, SendClosure},
 };
-use aries_vcx_core::{
- anoncreds::credx_anoncreds::IndyCredxAnonCreds, ledger::indy_vdr_ledger::DefaultIndyLedgerRead,
-};
+use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_ledger::ledger::indy_vdr_ledger::DefaultIndyLedgerRead;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
 use crate::{

diff --git a/aries/agents/aries-vcx-agent/src/handlers/prover.rs b/aries/agents/aries-vcx-agent/src/handlers/prover.rs
@@ -11,9 +11,8 @@ use aries_vcx::{
  },
  protocols::{proof_presentation::prover::state_machine::ProverState, SendClosure},
 };
-use aries_vcx_core::{
- anoncreds::credx_anoncreds::IndyCredxAnonCreds, ledger::indy_vdr_ledger::DefaultIndyLedgerRead,
-};
+use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_ledger::ledger::indy_vdr_ledger::DefaultIndyLedgerRead;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 use serde_json::Value;
 

diff --git a/aries/agents/aries-vcx-agent/src/handlers/revocation_registry.rs b/aries/agents/aries-vcx-agent/src/handlers/revocation_registry.rs
@@ -5,10 +5,8 @@ use std::{
 
 use anoncreds_types::data_types::identifiers::cred_def_id::CredentialDefinitionId;
 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},
-};
+use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_ledger::ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
 use crate::{

diff --git a/aries/agents/aries-vcx-agent/src/handlers/schema.rs b/aries/agents/aries-vcx-agent/src/handlers/schema.rs
@@ -1,12 +1,10 @@
 use std::sync::{Arc, Mutex};
 
 use aries_vcx::{common::primitives::credential_schema::Schema, did_parser_nom::Did};
-use aries_vcx_core::{
- anoncreds::credx_anoncreds::IndyCredxAnonCreds,
- ledger::{
- base_ledger::AnoncredsLedgerRead,
- indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},
- },
+use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_ledger::ledger::{
+ base_ledger::AnoncredsLedgerRead,
+ indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},
 };
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 

diff --git a/aries/agents/aries-vcx-agent/src/handlers/verifier.rs b/aries/agents/aries-vcx-agent/src/handlers/verifier.rs
@@ -16,9 +16,8 @@ use aries_vcx::{
  SendClosure,
  },
 };
-use aries_vcx_core::{
- anoncreds::credx_anoncreds::IndyCredxAnonCreds, ledger::indy_vdr_ledger::DefaultIndyLedgerRead,
-};
+use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_ledger::ledger::indy_vdr_ledger::DefaultIndyLedgerRead;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
 use super::connection::ServiceConnections;

diff --git a/aries/aries_vcx/Cargo.toml b/aries/aries_vcx/Cargo.toml
@@ -42,6 +42,8 @@ messages = { path = "../messages" }
 diddoc_legacy = { path = "../misc/legacy/diddoc_legacy" }
 aries_vcx_core = { path = "../aries_vcx_core" }
 aries_vcx_wallet = { path = "../aries_vcx_wallet" }
+aries_vcx_ledger = { path = "../aries_vcx_ledger" }
+indy-vdr = { git = "https://github.com/hyperledger/indy-vdr.git", rev = "c143268", default-features = false, features = ["log"] }
 shared = { path = "../misc/shared" }
 anoncreds_types = { path = "../misc/anoncreds_types" }
 did_parser_nom = { path = "../../did_core/did_parser_nom" }

diff --git a/aries/aries_vcx/src/common/credentials/mod.rs b/aries/aries_vcx/src/common/credentials/mod.rs
@@ -1,7 +1,5 @@
-use aries_vcx_core::{
- anoncreds::base_anoncreds::{BaseAnonCreds, CredentialId},
- ledger::base_ledger::AnoncredsLedgerRead,
-};
+use aries_vcx_core::anoncreds::base_anoncreds::{BaseAnonCreds, CredentialId};
+use aries_vcx_ledger::ledger::base_ledger::AnoncredsLedgerRead;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 use time::OffsetDateTime;
 

diff --git a/aries/aries_vcx/src/common/keys.rs b/aries/aries_vcx/src/common/keys.rs
@@ -1,4 +1,4 @@
-use aries_vcx_core::ledger::base_ledger::{IndyLedgerRead, IndyLedgerWrite};
+use aries_vcx_ledger::ledger::base_ledger::{IndyLedgerRead, IndyLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 use did_parser_nom::Did;
 use public_key::{Key, KeyType};

diff --git a/aries/aries_vcx/src/common/ledger/transactions.rs b/aries/aries_vcx/src/common/ledger/transactions.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use aries_vcx_core::ledger::{
+use aries_vcx_ledger::ledger::{
  base_ledger::{IndyLedgerRead, IndyLedgerWrite},
  indy_vdr_ledger::{LedgerRole, UpdateRole},
 };

diff --git a/aries/aries_vcx/src/common/primitives/credential_definition.rs b/aries/aries_vcx/src/common/primitives/credential_definition.rs
@@ -7,9 +7,10 @@ use anoncreds_types::data_types::{
  messages::cred_definition_config::CredentialDefinitionConfig,
 };
 use aries_vcx_core::{
- anoncreds::base_anoncreds::BaseAnonCreds,
- errors::error::AriesVcxCoreErrorKind,
- global::settings::DEFAULT_SERIALIZE_VERSION,
+ anoncreds::base_anoncreds::BaseAnonCreds, global::settings::DEFAULT_SERIALIZE_VERSION,
+};
+use aries_vcx_ledger::{
+ errors::error::VcxLedgerError,
  ledger::base_ledger::{AnoncredsLedgerRead, AnoncredsLedgerWrite},
 };
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
@@ -77,14 +78,17 @@ async fn _try_get_cred_def_from_ledger(
 ) -> VcxResult<Option<String>> {
  match ledger.get_cred_def(cred_def_id, Some(issuer_did)).await {
  Ok(cred_def) => Ok(Some(serde_json::to_string(&cred_def)?)),
- Err(err) if err.kind() == AriesVcxCoreErrorKind::LedgerItemNotFound => Ok(None),
- Err(err) => Err(AriesVcxError::from_msg(
- AriesVcxErrorKind::InvalidLedgerResponse,
- format!(
- "Failed to check presence of credential definition id {} on the ledger\nError: {}",
- cred_def_id, err
- ),
- )),
+ Err(err) => match err {
+ VcxLedgerError::LedgerItemNotFound => Ok(None),
+ _ => Err(AriesVcxError::from_msg(
+ AriesVcxErrorKind::InvalidLedgerResponse,
+ format!(
+ "Failed to check presence of credential definition id {} on the \
+ ledger\nError: {}",
+ cred_def_id, err
+ ),
+ )),
+ },
  }
 }
 

diff --git a/aries/aries_vcx/src/common/primitives/credential_schema.rs b/aries/aries_vcx/src/common/primitives/credential_schema.rs
@@ -3,8 +3,8 @@ use anoncreds_types::data_types::{
 };
 use aries_vcx_core::{
  anoncreds::base_anoncreds::BaseAnonCreds, global::settings::DEFAULT_SERIALIZE_VERSION,
- ledger::base_ledger::AnoncredsLedgerWrite,
 };
+use aries_vcx_ledger::ledger::base_ledger::AnoncredsLedgerWrite;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 use did_parser_nom::Did;
 

diff --git a/aries/aries_vcx/src/common/primitives/revocation_registry.rs b/aries/aries_vcx/src/common/primitives/revocation_registry.rs
@@ -7,8 +7,8 @@ use anoncreds_types::data_types::{
 use aries_vcx_core::{
  anoncreds::base_anoncreds::BaseAnonCreds,
  errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind},
- ledger::base_ledger::{AnoncredsLedgerRead, AnoncredsLedgerWrite},
 };
+use aries_vcx_ledger::ledger::base_ledger::{AnoncredsLedgerRead, AnoncredsLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 use did_parser_nom::Did;
 

diff --git a/aries/aries_vcx/src/common/proofs/prover/mod.rs b/aries/aries_vcx/src/common/proofs/prover/mod.rs
@@ -6,9 +6,8 @@ use anoncreds_types::data_types::messages::{
  cred_selection::SelectedCredentials, pres_request::PresentationRequest,
  presentation::Presentation,
 };
-use aries_vcx_core::{
- anoncreds::base_anoncreds::BaseAnonCreds, ledger::base_ledger::AnoncredsLedgerRead,
-};
+use aries_vcx_core::anoncreds::base_anoncreds::BaseAnonCreds;
+use aries_vcx_ledger::ledger::base_ledger::AnoncredsLedgerRead;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
 use crate::{

diff --git a/aries/aries_vcx/src/common/proofs/prover/prover_internal.rs b/aries/aries_vcx/src/common/proofs/prover/prover_internal.rs
@@ -8,13 +8,10 @@ use anoncreds_types::data_types::{
  presentation::{RequestedAttribute, RequestedCredentials, RequestedPredicate},
  },
 };
-use aries_vcx_core::{
- anoncreds::base_anoncreds::{
- BaseAnonCreds, CredentialDefinitionsMap, RevocationStatesMap, SchemasMap,
- },
- errors::error::AriesVcxCoreErrorKind,
- ledger::base_ledger::AnoncredsLedgerRead,
+use aries_vcx_core::anoncreds::base_anoncreds::{
+ BaseAnonCreds, CredentialDefinitionsMap, RevocationStatesMap, SchemasMap,
 };
+use aries_vcx_ledger::ledger::base_ledger::AnoncredsLedgerRead;
 
 use crate::errors::error::prelude::*;
 
@@ -76,9 +73,9 @@ pub async fn build_cred_defs_json_prover(
  let credential_def = ledger
  .get_cred_def(&cred_info.cred_def_id, None)
  .await
- .map_err(|err| {
- err.map(
- AriesVcxCoreErrorKind::InvalidProofCredentialData,
+ .map_err(|_err| {
+ AriesVcxError::from_msg(
+ AriesVcxErrorKind::InvalidProofCredentialData,
  "Cannot get credential definition",
  )
  })?;
@@ -270,7 +267,7 @@ pub fn build_requested_credentials_json(
 pub mod pool_tests {
  use std::error::Error;
 
- use aries_vcx_core::ledger::indy::pool::test_utils::get_temp_dir_path;
+ use aries_vcx_ledger::ledger::indy::pool::test_utils::get_temp_dir_path;
  use test_utils::{
  constants::{cred_def_id, schema_id, CRED_REV_ID, LICENCE_CRED_ID},
  devsetup::build_setup_profile,
@@ -318,7 +315,7 @@ pub mod pool_tests {
 
 #[cfg(test)]
 pub mod unit_tests {
- use aries_vcx_core::ledger::indy::pool::test_utils::get_temp_dir_path;
+ use aries_vcx_ledger::ledger::indy::pool::test_utils::get_temp_dir_path;
  use serde_json::Value;
  use test_utils::{
  constants::{

diff --git a/aries/aries_vcx/src/common/proofs/verifier/mod.rs b/aries/aries_vcx/src/common/proofs/verifier/mod.rs
@@ -1,8 +1,7 @@
 mod verifier_internal;
 
-use aries_vcx_core::{
- anoncreds::base_anoncreds::BaseAnonCreds, ledger::base_ledger::AnoncredsLedgerRead,
-};
+use aries_vcx_core::anoncreds::base_anoncreds::BaseAnonCreds;
+use aries_vcx_ledger::ledger::base_ledger::AnoncredsLedgerRead;
 
 use crate::{
  common::proofs::verifier::verifier_internal::{