testing/remove-mixed-breed

.github/workflows/main.yml

@@ -197,7 +197,6 @@ jobs:
           cargo check --features vdrtools --no-default-features
           cargo check --features modular_libs --no-default-features
           cargo check --features vdr_proxy_ledger --no-default-features
-          cargo check --features mixed_breed
 
   ##########################################################################################
   ##############################   DOCKER BUILD   ##########################################
@@ -483,17 +482,6 @@ jobs:
         with:
           name: "docker-services-${{ github.job }}"
 
-  test-integration-aries-vcx-mixed-breed:
-    needs: workflow-setup
-    runs-on: ubuntu-20.04
-    steps:
-      - name: "Git checkout"
-        uses: actions/checkout@v3
-      - name: "Setup rust testing environment"
-        uses: ./.github/actions/setup-testing-rust
-      - name: "Run aries-vcx integration tests"
-        run: RUST_TEST_THREADS=1 cargo test --manifest-path="aries_vcx/Cargo.toml" -F mixed_breed -- --include-ignored;
-
   test-integration-aries-vcx-migration:
     needs: workflow-setup
     runs-on: ubuntu-20.04

aries_vcx/Cargo.toml

@@ -18,9 +18,6 @@ modular_libs = ["aries_vcx_core/modular_libs"]
 # TODO: Remove using "vdrtools" feature flag for vdr_proxy_ledger once IndyCredxAnonCreds
 # is fully implemented
 vdr_proxy_ledger = ["aries_vcx_core/vdr_proxy_ledger", "vdrtools"]
-# Temporary feature used for testing the full credx anoncreds impl
-# using vdrtools ledger and wallet.
-mixed_breed = ["vdrtools", "modular_libs"]
 # Used for testing the migrator
 migration = ["vdrtools", "modular_libs"]
 

aries_vcx/src/common/keys.rs

@@ -83,11 +83,7 @@ pub async fn get_verkey_from_ledger(indy_ledger: &Arc<dyn IndyLedgerRead>, did:
 mod test {
     #[tokio::test]
     #[ignore]
-    #[cfg(all(
-        not(feature = "vdr_proxy_ledger"),
-        not(feature = "modular_libs"),
-        not(feature = "mixed_breed")
-    ))]
+    #[cfg(all(not(feature = "vdr_proxy_ledger"), not(feature = "modular_libs"),))]
     async fn test_pool_rotate_verkey_fails() {
         use super::*;
 

aries_vcx/src/core/profile/mod.rs

@@ -1,5 +1,3 @@
-#[cfg(feature = "mixed_breed")]
-pub mod mixed_breed_profile;
 #[cfg(feature = "modular_libs")]
 pub mod modular_libs_profile;
 pub mod profile;

aries_vcx/src/utils/devsetup.rs

@@ -32,8 +32,6 @@ use aries_vcx_core::indy::ledger::pool::{
     create_pool_ledger_config, indy_close_pool, indy_delete_pool, indy_open_pool,
 };
 
-#[cfg(feature = "mixed_breed")]
-use crate::core::profile::mixed_breed_profile::MixedBreedProfile;
 #[cfg(feature = "modular_libs")]
 use crate::core::profile::modular_libs_profile::ModularLibsProfile;
 #[cfg(feature = "modular_libs")]
@@ -138,12 +136,6 @@ impl SetupProfile {
             info!("SetupProfile >> using indy profile");
             SetupProfile::build_profile_vdrtools(genesis_file_path).await
         };
-        #[cfg(feature = "mixed_breed")]
-        return {
-            info!("SetupProfile >> using mixed breed profile");
-            SetupProfile::build_profile_mixed_breed(genesis_file_path).await
-        };
-
         #[cfg(feature = "modular_libs")]
         return {
             info!("SetupProfile >> using modular profile");
@@ -215,36 +207,6 @@ impl SetupProfile {
         }
     }
 
-    #[cfg(feature = "mixed_breed")]
-    async fn build_profile_mixed_breed(genesis_file_path: String) -> SetupProfile {
-        // todo: can remove?
-        let pool_name = Uuid::new_v4().to_string();
-        create_pool_ledger_config(&pool_name, &genesis_file_path).unwrap();
-        let pool_handle = indy_open_pool(&pool_name, None).await.unwrap();
-
-        let (institution_did, wallet_handle) = setup_issuer_wallet().await;
-
-        let profile: Arc<dyn Profile> = Arc::new(MixedBreedProfile::new(wallet_handle, pool_handle.clone()));
-
-        Arc::clone(&profile)
-            .inject_anoncreds()
-            .prover_create_link_secret(settings::DEFAULT_LINK_SECRET_ALIAS)
-            .await
-            .unwrap();
-
-        async fn indy_teardown(pool_handle: PoolHandle, pool_name: String) {
-            indy_close_pool(pool_handle.clone()).await.unwrap();
-            indy_delete_pool(&pool_name).await.unwrap();
-        }
-
-        SetupProfile {
-            genesis_file_path,
-            institution_did,
-            profile,
-            teardown: Arc::new(move || Box::pin(indy_teardown(pool_handle, pool_name.clone()))),
-        }
-    }
-
     #[cfg(feature = "vdr_proxy_ledger")]
     async fn build_profile_vdr_proxy_ledger(genesis_file_path: String) -> SetupProfile {
         use std::env;

libvcx_core/Cargo.toml

@@ -36,7 +36,6 @@ uuid = { version = "0.7.4", default-features = false, features = ["v4"] }
 agency_client = { path = "../agency_client" }
 async-trait = "0.1.61"
 url = "2.3.1"
-wallet_migrator = { path = "../wallet_migrator" }
 
 [dev-dependencies]
 tokio = { version = "1.20", features = [ "rt", "macros" ] }

libvcx_core/src/api_vcx/api_global/wallet.rs

@@ -6,9 +6,6 @@ use aries_vcx::aries_vcx_core::anoncreds::base_anoncreds::BaseAnonCreds;
 #[cfg(all(feature = "anoncreds_credx"))]
 use aries_vcx::aries_vcx_core::anoncreds::credx_anoncreds::IndyCredxAnonCreds;
 use aries_vcx::aries_vcx_core::anoncreds::indy_anoncreds::IndySdkAnonCreds;
-use aries_vcx::aries_vcx_core::indy::wallet::close_wallet;
-use aries_vcx::aries_vcx_core::indy::wallet::create_and_open_wallet;
-use aries_vcx::aries_vcx_core::indy::wallet::delete_wallet;
 use aries_vcx::aries_vcx_core::indy::wallet::{
     close_search_wallet, fetch_next_records_wallet, import, open_search_wallet, IssuerConfig, RestoreWalletConfigs,
     WalletConfig,
@@ -227,26 +224,6 @@ pub async fn wallet_import(config: &RestoreWalletConfigs) -> LibvcxResult<()> {
     map_ariesvcx_core_result(import(config).await)
 }
 
-pub async fn wallet_migrate(wallet_config: &WalletConfig) -> LibvcxResult<()> {
-    let src_wallet_handle = get_main_wallet_handle()?;
-    let dest_wallet_handle = create_and_open_wallet(wallet_config).await?;
-
-    let migration_res = wallet_migrator::migrate_wallet(
-        src_wallet_handle,
-        dest_wallet_handle,
-        wallet_migrator::vdrtools2credx::migrate_any_record,
-    )
-    .await;
-
-    if let Err(e) = migration_res {
-        close_wallet(dest_wallet_handle).await.ok();
-        delete_wallet(wallet_config).await.ok();
-        Err(LibvcxError::from_msg(LibvcxErrorKind::WalletMigrationFailed, e))
-    } else {
-        Ok(())
-    }
-}
-
 #[allow(clippy::unwrap_used)]
 pub mod test_utils {
     use aries_vcx::aries_vcx_core::indy::wallet::WalletConfig;
@@ -327,29 +304,6 @@ pub mod tests {
     };
     use crate::errors::error::{LibvcxErrorKind, LibvcxResult};
 
-    #[tokio::test]
-    async fn test_wallet_migrate() {
-        let wallet_name = format!("test_create_wallet_{}", uuid::Uuid::new_v4());
-        let config: WalletConfig = serde_json::from_value(json!({
-            "wallet_name": wallet_name,
-            "wallet_key": DEFAULT_WALLET_KEY,
-            "wallet_key_derivation": WALLET_KDF_RAW
-        }))
-        .unwrap();
-
-        create_and_open_as_main_wallet(&config).await.unwrap();
-
-        let wallet_name = format!("test_migrate_wallet_{}", uuid::Uuid::new_v4());
-        let new_config: WalletConfig = serde_json::from_value(json!({
-            "wallet_name": wallet_name,
-            "wallet_key": DEFAULT_WALLET_KEY,
-            "wallet_key_derivation": WALLET_KDF_RAW
-        }))
-        .unwrap();
-
-        super::wallet_migrate(&new_config).await.unwrap();
-    }
-
     #[tokio::test]
     async fn test_wallet_create() {
         let _setup = SetupEmpty::init();

libvcx_core/src/errors/error.rs

@@ -138,8 +138,6 @@ pub enum LibvcxErrorKind {
     DuplicationWallet,
     #[error("Wallet record not found")]
     WalletRecordNotFound,
-    #[error("Wallet migration failed")]
-    WalletMigrationFailed,
     #[error("Record already exists in the wallet")]
     DuplicationWalletRecord,
     #[error("Wallet not found")]

libvdrtools/indy-api-types/src/lib.rs

@@ -19,12 +19,6 @@ pub type IndyHandle = i32;
 pub struct WalletHandle(pub i32);
 pub const INVALID_WALLET_HANDLE: WalletHandle = WalletHandle(0);
 
-impl From<i32> for WalletHandle {
-    fn from(value: i32) -> Self {
-        Self(value)
-    }
-}
-
 pub type CallbackHandle = i32;
 
 pub type PoolHandle = i32;

wrappers/node/src/api/wallet.ts

@@ -9,14 +9,6 @@ export async function createWallet(config: object): Promise<void> {
   }
 }
 
-export async function migrateWallet(config: object): Promise<void> {
-  try {
-    return await ffi.walletMigrate(JSON.stringify(config));
-  } catch (err: any) {
-    throw new VCXInternalError(err);
-  }
-}
-
 export async function configureIssuerWallet(seed: string): Promise<string> {
   try {
     return await ffi.configureIssuerWallet(seed);

wrappers/vcx-napi-rs/Cargo.toml

@@ -22,7 +22,6 @@ anoncreds_vdrtools = ["libvcx_core/anoncreds_vdrtools"]
 
 [dependencies]
 libvcx_core = { path = "../../libvcx_core"  }
-wallet_migrator = { path = "../../wallet_migrator" }
 log = "0.4.16"
 napi = { version = "2.10.14", default-features = false, features = [ "async" ] }
 napi-derive = { version = "2.10.1" }

wrappers/vcx-napi-rs/index.d.ts

@@ -195,7 +195,6 @@ export function unpack(data: Buffer): Promise<string>
 export function createPairwiseInfo(): Promise<string>
 export function walletImport(config: string): Promise<void>
 export function walletExport(path: string, backupKey: string): Promise<void>
-export function walletMigrate(walletConfig: string): Promise<void>
 export function getVerkeyFromWallet(did: string): Promise<string>
 export function rotateVerkey(did: string): Promise<void>
 export function rotateVerkeyStart(did: string): Promise<string>