remove credx

Signed-off-by: gmulhearn <[email protected]>
hyperledger · Oct 11, 2024 · cbb2117 · cbb2117
1 parent d9aeb42
commit cbb2117
Show file tree

Hide file tree

Showing 27 changed files with 44 additions and 2,003 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -77,7 +77,6 @@ indy-vdr = { git = "https://github.com/hyperledger/indy-vdr.git", tag = "v0.4.3"
     "log",
 ] }
 indy-vdr-proxy-client = { git = "https://github.com/hyperledger/indy-vdr.git", tag = "v0.4.3" }
-indy-credx = { git = "https://github.com/hyperledger/indy-shared-rs", tag = "v1.1.0" }
 anoncreds = { git = "https://github.com/hyperledger/anoncreds-rs.git", tag = "v0.2.0" }
 aries-askar = { version = "0.3.1" }
 askar-crypto = { version = "0.3.1", default-features = false }
diff --git a/aries/agents/aries-vcx-agent/Cargo.toml b/aries/agents/aries-vcx-agent/Cargo.toml
@@ -11,7 +11,7 @@ aries_vcx = { path = "../../aries_vcx" }
 aries_vcx_wallet = { path = "../../aries_vcx_wallet", features = [
     "askar_wallet",
 ] }
-aries_vcx_anoncreds = { path = "../../aries_vcx_anoncreds", features = ["credx"] }
+aries_vcx_anoncreds = { path = "../../aries_vcx_anoncreds", features = ["anoncreds"] }
 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_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::anoncreds::Anoncreds;
 use aries_vcx_ledger::ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
@@ -16,7 +16,7 @@ pub struct Agent<W> {
     pub(super) issuer_did: String,
     pub(super) ledger_read: Arc<DefaultIndyLedgerRead>,
     pub(super) ledger_write: Arc<DefaultIndyLedgerWrite>,
-    pub(super) anoncreds: IndyCredxAnonCreds,
+    pub(super) anoncreds: Anoncreds,
     pub(super) wallet: Arc<W>,
     pub(super) connections: Arc<ServiceConnections<W>>,
     pub(super) schemas: Arc<ServiceSchemas<W>>,
@@ -64,7 +64,7 @@ impl<T: BaseWallet> Agent<T> {
         &self.ledger_write
     }
 
-    pub fn anoncreds(&self) -> &IndyCredxAnonCreds {
+    pub fn anoncreds(&self) -> &Anoncreds {
         &self.anoncreds
     }
 

diff --git a/aries/agents/aries-vcx-agent/src/agent/init.rs b/aries/agents/aries-vcx-agent/src/agent/init.rs
@@ -11,7 +11,7 @@ use aries_vcx::{
 };
 use aries_vcx_anoncreds::{
     self,
-    anoncreds::{base_anoncreds::BaseAnonCreds, credx_anoncreds::IndyCredxAnonCreds},
+    anoncreds::{anoncreds::Anoncreds, base_anoncreds::BaseAnonCreds},
     errors::error::VcxAnoncredsError,
 };
 use aries_vcx_ledger::ledger::indy_vdr_ledger::{
@@ -62,7 +62,7 @@ pub async fn build_askar_wallet(
     let wallet = config_wallet.create_wallet().await.unwrap();
     let config_issuer = wallet.configure_issuer(&issuer_seed).await.unwrap();
 
-    let anoncreds = IndyCredxAnonCreds;
+    let anoncreds = Anoncreds;
 
     if let Err(err) = anoncreds
         .prover_create_link_secret(&wallet, &DEFAULT_LINK_SECRET_ALIAS.to_string())
@@ -123,7 +123,7 @@ impl<W: BaseWallet> Agent<W> {
             genesis_file_path: genesis_path,
         };
 
-        let anoncreds = IndyCredxAnonCreds;
+        let anoncreds = Anoncreds;
         let (ledger_read, ledger_write) = build_ledger_components(vcx_pool_config.clone()).unwrap();
 
         let ledger_read = Arc::new(ledger_read);

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_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::anoncreds::Anoncreds;
 use aries_vcx_ledger::ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
@@ -14,7 +14,7 @@ use crate::{
 pub struct ServiceCredentialDefinitions<T> {
     ledger_read: Arc<DefaultIndyLedgerRead>,
     ledger_write: Arc<DefaultIndyLedgerWrite>,
-    anoncreds: IndyCredxAnonCreds,
+    anoncreds: Anoncreds,
     wallet: Arc<T>,
     cred_defs: AgentStorageInMem<CredentialDef>,
 }
@@ -23,7 +23,7 @@ impl<T: BaseWallet> ServiceCredentialDefinitions<T> {
     pub fn new(
         ledger_read: Arc<DefaultIndyLedgerRead>,
         ledger_write: Arc<DefaultIndyLedgerWrite>,
-        anoncreds: IndyCredxAnonCreds,
+        anoncreds: Anoncreds,
         wallet: Arc<T>,
     ) -> Self {
         Self {

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_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::anoncreds::Anoncreds;
 use aries_vcx_ledger::ledger::indy_vdr_ledger::DefaultIndyLedgerRead;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
@@ -40,7 +40,7 @@ impl HolderWrapper {
 
 pub struct ServiceCredentialsHolder<T> {
     ledger_read: Arc<DefaultIndyLedgerRead>,
-    anoncreds: IndyCredxAnonCreds,
+    anoncreds: Anoncreds,
     wallet: Arc<T>,
     creds_holder: AgentStorageInMem<HolderWrapper>,
     service_connections: Arc<ServiceConnections<T>>,
@@ -49,7 +49,7 @@ pub struct ServiceCredentialsHolder<T> {
 impl<T: BaseWallet> ServiceCredentialsHolder<T> {
     pub fn new(
         ledger_read: Arc<DefaultIndyLedgerRead>,
-        anoncreds: IndyCredxAnonCreds,
+        anoncreds: Anoncreds,
         wallet: Arc<T>,
         service_connections: Arc<ServiceConnections<T>>,
     ) -> Self {

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_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::anoncreds::Anoncreds;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
 use crate::{
@@ -37,15 +37,15 @@ impl IssuerWrapper {
 }
 
 pub struct ServiceCredentialsIssuer<T> {
-    anoncreds: IndyCredxAnonCreds,
+    anoncreds: Anoncreds,
     wallet: Arc<T>,
     creds_issuer: AgentStorageInMem<IssuerWrapper>,
     service_connections: Arc<ServiceConnections<T>>,
 }
 
 impl<T: BaseWallet> ServiceCredentialsIssuer<T> {
     pub fn new(
-        anoncreds: IndyCredxAnonCreds,
+        anoncreds: Anoncreds,
         wallet: Arc<T>,
         service_connections: Arc<ServiceConnections<T>>,
     ) -> Self {

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_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::anoncreds::Anoncreds;
 use aries_vcx_ledger::ledger::indy_vdr_ledger::DefaultIndyLedgerRead;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 use serde_json::Value;
@@ -40,7 +40,7 @@ impl ProverWrapper {
 
 pub struct ServiceProver<T> {
     ledger_read: Arc<DefaultIndyLedgerRead>,
-    anoncreds: IndyCredxAnonCreds,
+    anoncreds: Anoncreds,
     wallet: Arc<T>,
     provers: AgentStorageInMem<ProverWrapper>,
     service_connections: Arc<ServiceConnections<T>>,
@@ -49,7 +49,7 @@ pub struct ServiceProver<T> {
 impl<T: BaseWallet> ServiceProver<T> {
     pub fn new(
         ledger_read: Arc<DefaultIndyLedgerRead>,
-        anoncreds: IndyCredxAnonCreds,
+        anoncreds: Anoncreds,
         wallet: Arc<T>,
         service_connections: Arc<ServiceConnections<T>>,
     ) -> Self {

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_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::anoncreds::Anoncreds;
 use aries_vcx_ledger::ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite};
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
@@ -17,7 +17,7 @@ use crate::{
 pub struct ServiceRevocationRegistries<T> {
     ledger_write: Arc<DefaultIndyLedgerWrite>,
     ledger_read: Arc<DefaultIndyLedgerRead>,
-    anoncreds: IndyCredxAnonCreds,
+    anoncreds: Anoncreds,
     wallet: Arc<T>,
     issuer_did: Did,
     rev_regs: AgentStorageInMem<RevocationRegistry>,
@@ -27,7 +27,7 @@ impl<T: BaseWallet> ServiceRevocationRegistries<T> {
     pub fn new(
         ledger_write: Arc<DefaultIndyLedgerWrite>,
         ledger_read: Arc<DefaultIndyLedgerRead>,
-        anoncreds: IndyCredxAnonCreds,
+        anoncreds: Anoncreds,
         wallet: Arc<T>,
         issuer_did: String,
     ) -> Self {

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_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::anoncreds::Anoncreds;
 use aries_vcx_ledger::ledger::{
     base_ledger::AnoncredsLedgerRead,
     indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},
@@ -16,7 +16,7 @@ use crate::{
 pub struct ServiceSchemas<T> {
     ledger_read: Arc<DefaultIndyLedgerRead>,
     ledger_write: Arc<DefaultIndyLedgerWrite>,
-    anoncreds: IndyCredxAnonCreds,
+    anoncreds: Anoncreds,
     wallet: Arc<T>,
     issuer_did: Did,
     schemas: AgentStorageInMem<Schema>,
@@ -26,7 +26,7 @@ impl<T: BaseWallet> ServiceSchemas<T> {
     pub fn new(
         ledger_read: Arc<DefaultIndyLedgerRead>,
         ledger_write: Arc<DefaultIndyLedgerWrite>,
-        anoncreds: IndyCredxAnonCreds,
+        anoncreds: Anoncreds,
         wallet: Arc<T>,
         issuer_did: String,
     ) -> Self {

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_anoncreds::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
+use aries_vcx_anoncreds::anoncreds::anoncreds::Anoncreds;
 use aries_vcx_ledger::ledger::indy_vdr_ledger::DefaultIndyLedgerRead;
 use aries_vcx_wallet::wallet::base_wallet::BaseWallet;
 
@@ -44,7 +44,7 @@ impl VerifierWrapper {
 
 pub struct ServiceVerifier<T> {
     ledger_read: Arc<DefaultIndyLedgerRead>,
-    anoncreds: IndyCredxAnonCreds,
+    anoncreds: Anoncreds,
     wallet: Arc<T>,
     verifiers: AgentStorageInMem<VerifierWrapper>,
     service_connections: Arc<ServiceConnections<T>>,
@@ -53,7 +53,7 @@ pub struct ServiceVerifier<T> {
 impl<T: BaseWallet> ServiceVerifier<T> {
     pub fn new(
         ledger_read: Arc<DefaultIndyLedgerRead>,
-        anoncreds: IndyCredxAnonCreds,
+        anoncreds: Anoncreds,
         wallet: Arc<T>,
         service_connections: Arc<ServiceConnections<T>>,
     ) -> Self {

diff --git a/aries/aries_vcx/Cargo.toml b/aries/aries_vcx/Cargo.toml
@@ -11,16 +11,10 @@ path = "src/lib.rs"
 doctest = false
 
 [features]
-credx = [
-    "aries_vcx_anoncreds/credx",
-    "test_utils/askar_wallet",
-    "test_utils/credx"
-]
 anoncreds = ["aries_vcx_anoncreds/anoncreds", "test_utils/anoncreds", "test_utils/askar_wallet"]
 vdr_proxy_ledger = [
     "aries_vcx_wallet/askar_wallet",
     "test_utils/vdr_proxy_ledger",
-    "credx",
 ]
 backtrace_errors = ["backtrace"]
 

diff --git a/aries/aries_vcx/src/common/keys.rs b/aries/aries_vcx/src/common/keys.rs
@@ -111,7 +111,7 @@ pub async fn get_verkey_from_ledger(
 //
 //     #[tokio::test]
 //     #[ignore]
-//     #[cfg(all(not(feature = "vdr_proxy_ledger"), not(feature = "credx"),))]
+//     #[cfg(all(not(feature = "vdr_proxy_ledger")))]
 //     async fn test_pool_rotate_verkey_fails() {
 //         use super::*;
 //

diff --git a/aries/aries_vcx/tests/test_pool.rs b/aries/aries_vcx/tests/test_pool.rs
@@ -427,9 +427,6 @@ async fn test_pool_rev_reg_def_fails_for_cred_def_created_without_revocation(
     )
     .await;
 
-    #[cfg(feature = "credx")]
-    assert_eq!(rc.unwrap_err().kind(), AriesVcxErrorKind::InvalidState);
-    #[cfg(not(feature = "credx"))]
     assert_eq!(rc.unwrap_err().kind(), AriesVcxErrorKind::InvalidInput);
     Ok(())
 }

diff --git a/aries/aries_vcx_anoncreds/Cargo.toml b/aries/aries_vcx_anoncreds/Cargo.toml
@@ -8,12 +8,10 @@ edition.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
-credx = ["dep:indy-credx"]
 anoncreds = ["dep:anoncreds"]
 legacy_proof = []
 
 [dependencies]
-indy-credx = { workspace = true, optional = true }
 anoncreds = { workspace = true, optional = true }
 aries_vcx_wallet = { path = "../aries_vcx_wallet" }
 anoncreds_types = { path = "../misc/anoncreds_types" }

diff --git a/aries/aries_vcx_anoncreds/src/anoncreds/anoncreds/mod.rs b/aries/aries_vcx_anoncreds/src/anoncreds/anoncreds/mod.rs
@@ -165,7 +165,7 @@ fn from_revocation_status_list_to_revocation_registry_delta(
     })
 }
 
-#[derive(Debug)]
+#[derive(Debug, Copy, Clone)]
 pub struct Anoncreds;
 
 #[derive(Debug, Deserialize, Serialize, Clone)]