refactor: move anoncreds to a separate crate (#1175)

Signed-off-by: Ondrej Prazak <[email protected]> Co-authored-by: Ondrej Prazak <[email protected]>
hyperledger · Apr 16, 2024 · ea35186 · ea35186
1 parent ac2d946
commit ea35186
Show file tree

Hide file tree

Showing 106 changed files with 642 additions and 1,348 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -140,28 +140,6 @@ jobs:
       - name: "Verify clippy across the entire workspace with default features"
         run: just clippy-aries-vcx ${{ matrix.backend }}
 
-  aries_vcx_core_clippy:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        backend: ["credx,vdrtools_wallet", "vdr_proxy_ledger,askar_wallet"]
-    steps:
-      - name: "Git checkout"
-        uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
-          default: true
-          components: clippy
-      - name: "Install dependencies"
-        shell: bash
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y libsodium-dev libssl-dev libzmq3-dev
-          sudo snap install --edge --classic just
-      - name: "Verify clippy across the entire workspace with default features"
-        run: just clippy-aries-vcx-core ${{ matrix.backend }}
-
   ##########################################################################################
   ##############################   DOCKER BUILD   ##########################################
 
@@ -294,27 +272,7 @@ jobs:
       - name: "Run wallet migration tests"
         run: just test-wallet-migrator
 
-  test-intergation-aries-vcx-core:
-    needs: workflow-setup
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        wallet: ["vdrtools_wallet", "askar_wallet"]
-    steps:
-      - name: "Git checkout"
-        uses: actions/checkout@v3
-      - name: "Setup rust testing environment"
-        uses: ./.github/actions/setup-testing-rust
-        with:
-          rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSION }}
-          default: true
-          skip-docker-setup: true
-      - name: "Install just"
-        run: sudo snap install --edge --classic just
-      - name: "Run aries-vcx-core integration tests"
-        run: just test-integration-aries-vcx-core ${{ matrix.wallet }}
-
-  test-compatibility-aries-vcx-core:
+  test-compatibility-aries-vcx-wallet:
     needs: workflow-setup
     runs-on: ubuntu-20.04
     steps:
@@ -328,8 +286,8 @@ jobs:
           skip-docker-setup: true
       - name: "Install just"
         run: sudo snap install --edge --classic just
-      - name: "Run aries-vcx-core compatibility tests"
-        run: just test-compatibility-aries-vcx-core
+      - name: "Run aries-vcx-wallet compatibility tests"
+        run: just test-compatibility-aries-vcx-wallet
 
   test-integration-aries-vcx:
     needs: workflow-setup

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ members = [
     "aries/agents/aries-vcx-agent",
     "aries/agents/aath-backchannel",
     "aries/wrappers/uniffi-aries-vcx/core",
-    "aries/aries_vcx_core",
+    "aries/aries_vcx_anoncreds",
     "aries/aries_vcx_wallet",
     "aries/aries_vcx_ledger",
     "aries/misc/indy_ledger_response_parser",

diff --git a/aries/agents/aath-backchannel/src/controllers/presentation.rs b/aries/agents/aath-backchannel/src/controllers/presentation.rs
@@ -5,7 +5,7 @@ use anoncreds_types::data_types::messages::pres_request::{
     AttributeInfo, NonRevokedInterval, PredicateInfo, PresentationRequestPayload,
 };
 use aries_vcx_agent::aries_vcx::{
-    aries_vcx_core::anoncreds::base_anoncreds::BaseAnonCreds,
+    aries_vcx_anoncreds::anoncreds::base_anoncreds::BaseAnonCreds,
     handlers::util::PresentationProposalData,
     messages::msg_fields::protocols::present_proof::v1::propose::{Predicate, PresentationAttr},
     protocols::proof_presentation::{

diff --git a/aries/agents/aath-backchannel/src/error.rs b/aries/agents/aath-backchannel/src/error.rs
@@ -79,10 +79,12 @@ impl std::convert::From<aries_vcx::errors::error::AriesVcxError> for HarnessErro
     }
 }
 
-impl std::convert::From<aries_vcx::aries_vcx_core::errors::error::AriesVcxCoreError>
+impl std::convert::From<aries_vcx::aries_vcx_anoncreds::errors::error::VcxAnoncredsError>
     for HarnessError
 {
-    fn from(vcx_err: aries_vcx::aries_vcx_core::errors::error::AriesVcxCoreError) -> HarnessError {
+    fn from(
+        vcx_err: aries_vcx::aries_vcx_anoncreds::errors::error::VcxAnoncredsError,
+    ) -> HarnessError {
         let kind = HarnessErrorType::InternalServerError;
         HarnessError {
             message: vcx_err.to_string(),

diff --git a/aries/agents/aries-vcx-agent/Cargo.toml b/aries/agents/aries-vcx-agent/Cargo.toml
@@ -8,13 +8,10 @@ edition.workspace = true
 [dependencies]
 serde = "1.0.145"
 aries_vcx = { path = "../../aries_vcx" }
-aries_vcx_core = { path = "../../aries_vcx_core", features = [
-    "credx",
-    "vdrtools_wallet",
-] }
 aries_vcx_wallet = { path = "../../aries_vcx_wallet", features = [
     "vdrtools_wallet",
 ] }
+aries_vcx_anoncreds = { path = "../../aries_vcx_anoncreds", features = ["credx"] }
 aries_vcx_ledger = { path = "../../aries_vcx_ledger"}
 anoncreds_types = { path = "../../misc/anoncreds_types" }
 shared = { path = "../../misc/shared" }

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,6 +1,6 @@
 use std::sync::Arc;
 
-use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
 use aries_vcx_ledger::ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 

diff --git a/aries/agents/aries-vcx-agent/src/agent/init.rs b/aries/agents/aries-vcx-agent/src/agent/init.rs
@@ -9,7 +9,7 @@ use aries_vcx::{
     did_parser_nom::Did,
     global::settings::DEFAULT_LINK_SECRET_ALIAS,
 };
-use aries_vcx_core::{
+use aries_vcx_anoncreds::{
     self,
     anoncreds::{base_anoncreds::BaseAnonCreds, credx_anoncreds::IndyCredxAnonCreds},
 };

diff --git a/aries/agents/aries-vcx-agent/src/error/convertors.rs b/aries/agents/aries-vcx-agent/src/error/convertors.rs
@@ -5,7 +5,6 @@ use aries_vcx::{
     errors::error::{AriesVcxError, AriesVcxErrorKind},
     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;
 
@@ -31,14 +30,6 @@ impl From<serde_json::Error> for AgentError {
     }
 }
 
-impl From<AriesVcxCoreError> for AgentError {
-    fn from(err: AriesVcxCoreError) -> Self {
-        let kind = AgentErrorKind::GenericAriesVcxError;
-        let message = format!("AriesVcxCore Error; err: {:?}", err.to_string());
-        AgentError { message, kind }
-    }
-}
-
 impl From<VcxLedgerError> for AgentError {
     fn from(err: VcxLedgerError) -> Self {
         let kind = AgentErrorKind::GenericAriesVcxError;

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,7 +2,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_nom::Did};
-use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
 use aries_vcx_ledger::ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 

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

diff --git a/aries/agents/aries-vcx-agent/src/handlers/issuer.rs b/aries/agents/aries-vcx-agent/src/handlers/issuer.rs
@@ -11,7 +11,7 @@ use aries_vcx::{
     },
     protocols::{issuance::issuer::state_machine::IssuerState, SendClosure},
 };
-use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
 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,7 +11,7 @@ use aries_vcx::{
     },
     protocols::{proof_presentation::prover::state_machine::ProverState, SendClosure},
 };
-use aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::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,7 +5,7 @@ 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;
+use aries_vcx_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
 use aries_vcx_ledger::ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 

diff --git a/aries/agents/aries-vcx-agent/src/handlers/schema.rs b/aries/agents/aries-vcx-agent/src/handlers/schema.rs
@@ -1,7 +1,7 @@
 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;
+use aries_vcx_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
 use aries_vcx_ledger::ledger::{
     base_ledger::AnoncredsLedgerRead,
     indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},

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

diff --git a/aries/agents/mediator/Cargo.toml b/aries/agents/mediator/Cargo.toml
@@ -15,9 +15,6 @@ aries_vcx = { path = "../../aries_vcx" }
 aries_vcx_wallet = { path = "../../aries_vcx_wallet", features = [
     "vdrtools_wallet",
 ] }
-aries_vcx_core = { path = "../../aries_vcx_core", features = [
-    "vdrtools_wallet",
-] }
 async-trait = "0.1.73"
 axum = "0.6"
 axum-macros = "0.3.8"

diff --git a/aries/agents/mediator/client-tui/Cargo.toml b/aries/agents/mediator/client-tui/Cargo.toml
@@ -6,9 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aries_vcx_core = { path = "../../../aries_vcx_core", features = [
-    "vdrtools_wallet",
-] }
 aries_vcx_wallet = { path = "../../../aries_vcx_wallet", features = [
     "vdrtools_wallet",
 ] }