clippy

Signed-off-by: Ondrej Prazak <[email protected]>

aries/agents/rust/mediator/client-tui/src/lib.rs

@@ -1,6 +1,5 @@
 use std::collections::VecDeque;
 
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use mediator::{
     aries_agent::{client::transports::AriesReqwest, ArcAgent},
     persistence::MediatorPersistence,

aries/agents/rust/mediator/client-tui/src/tui.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use client_tui::handle_register;
 use cursive::{
     direction::Orientation,

aries/agents/rust/mediator/src/aries_agent/client/mod.rs

@@ -13,7 +13,6 @@ use aries_vcx::{
     },
     utils::encryption_envelope::EncryptionEnvelope,
 };
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::{
     msg_fields::protocols::{
         connection::{response::Response, Connection},

aries/agents/rust/mediator/src/aries_agent/mod.rs

@@ -9,13 +9,9 @@ use aries_vcx_core::{
     errors::error::AriesVcxCoreError,
     wallet::{
         base_wallet::{BaseWallet, ManageWallet},
-        indy::{
-            wallet_config::{self, WalletConfig},
-            IndySdkWallet,
-        },
+        indy::wallet_config::WalletConfig,
         structs_io::UnpackMessageOutput,
     },
-    WalletHandle,
 };
 use diddoc_legacy::aries::{diddoc::AriesDidDoc, service::AriesService};
 use messages::{

aries/agents/rust/mediator/src/didcomm_handlers/connection.rs

@@ -1,4 +1,3 @@
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::connection::Connection;
 
 use super::{unhandled_aries_message, utils::prelude::*, ArcAgent};

aries/agents/rust/mediator/src/didcomm_handlers/forward.rs

@@ -1,4 +1,3 @@
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::{notification::ack::Ack, routing::Forward};
 
 use super::{utils::prelude::*, ArcAgent};

aries/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs

@@ -1,4 +1,3 @@
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::coordinate_mediation::{
     CoordinateMediation, MediateGrant, MediateGrantContent, MediateGrantDecorators,
 };

aries/agents/rust/mediator/src/didcomm_handlers/mod.rs

@@ -1,6 +1,5 @@
 use std::fmt::Debug;
 
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use axum::{body::Bytes, extract::State, Json};
 use messages::AriesMessage;
 use serde::{Deserialize, Serialize};

aries/agents/rust/mediator/src/didcomm_handlers/pickup.rs

@@ -1,4 +1,3 @@
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::pickup::Pickup;
 
 use super::utils::prelude::*;

aries/agents/rust/mediator/src/didcomm_handlers/utils.rs

@@ -1,8 +1,5 @@
 pub mod prelude {
-    pub use std::sync::Arc;
-
     pub use aries_vcx::utils::encryption_envelope::EncryptionEnvelope;
-    pub use aries_vcx_core::wallet::base_wallet::BaseWallet;
 
     pub use crate::{aries_agent::ArcAgent, persistence::MediatorPersistence, utils::prelude::*};
 }

aries/agents/rust/mediator/src/http_routes/mod.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use axum::{
     body::Bytes,
     extract::State,

aries/agents/rust/mediator/tests/common/agent_and_transport_utils.rs

@@ -7,7 +7,6 @@ use aries_vcx::{
     },
     utils::encryption_envelope::EncryptionEnvelope,
 };
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use mediator::{
     aries_agent::{

aries/aries_vcx_core/src/wallet/base_wallet/did_wallet.rs

@@ -3,9 +3,8 @@ use std::sync::Arc;
 use async_trait::async_trait;
 use public_key::Key;
 
-use crate::{errors::error::VcxCoreResult, wallet::structs_io::UnpackMessageOutput};
-
 use super::{did_data::DidData, BaseWallet};
+use crate::{errors::error::VcxCoreResult, wallet::structs_io::UnpackMessageOutput};
 
 #[async_trait]
 pub trait DidWallet {

aries/aries_vcx_core/src/wallet/base_wallet/migrate.rs

@@ -1,10 +1,9 @@
+use super::{record::Record, BaseWallet};
 use crate::{
     errors::error::{AriesVcxCoreErrorKind, VcxCoreResult},
     wallet::entry_tags::EntryTags,
 };
 
-use super::{record::Record, BaseWallet};
-
 #[derive(Debug)]
 pub struct MigrationStats {
     migrated: u32,
@@ -36,8 +35,8 @@ where
         num_record += 1;
         if num_record % 1000 == 1 {
             warn!(
-                "Migrating wallet record number {num_record} / {total:?}, intermediary \
-                 migration result: ${migration_result:?}"
+                "Migrating wallet record number {num_record} / {total:?}, intermediary migration \
+                 result: ${migration_result:?}"
             );
         }
         trace!("Migrating record: {:?}", source_record);
@@ -55,8 +54,7 @@ where
         let unwrapped_value = match &source_record.value() {
             None => {
                 warn!(
-                    "Skipping item missing 'value' field, record ({num_record}): \
-                     {source_record:?}"
+                    "Skipping item missing 'value' field, record ({num_record}): {source_record:?}"
                 );
                 migration_result.skipped += 1;
                 continue;
@@ -98,16 +96,15 @@ where
             Err(err) => match err.kind() {
                 AriesVcxCoreErrorKind::DuplicationWalletRecord => {
                     trace!(
-                        "Record type: {migrated_record:?} already exists in destination \
-                         wallet, skipping"
+                        "Record type: {migrated_record:?} already exists in destination wallet, \
+                         skipping"
                     );
                     migration_result.duplicated += 1;
                     continue;
                 }
                 _ => {
                     error!(
-                        "Error adding record {migrated_record:?} to destination wallet: \
-                         {err:?}"
+                        "Error adding record {migrated_record:?} to destination wallet: {err:?}"
                     );
                     migration_result.failed += 1;
                     return Err(err);

aries/aries_vcx_core/src/wallet/base_wallet/mod.rs

@@ -6,7 +6,6 @@ use self::{
     did_wallet::DidWallet, issuer_config::IssuerConfig, record::AllRecords,
     record_wallet::RecordWallet,
 };
-
 use crate::errors::error::VcxCoreResult;
 
 pub mod did_data;
@@ -24,7 +23,7 @@ pub trait ImportWallet {
 
 #[async_trait]
 pub trait ManageWallet {
-    async fn create_wallet(&self) -> VcxCoreResult<Arc<dyn BaseWallet>>;
+    async fn create_wallet(&self) -> VcxCoreResult<()>;
 
     async fn open_wallet(&self) -> VcxCoreResult<Arc<dyn BaseWallet>>;
 

aries/aries_vcx_core/src/wallet/base_wallet/record.rs

@@ -1,11 +1,10 @@
 use async_trait::async_trait;
 use typed_builder::TypedBuilder;
-
-use crate::{errors::error::VcxCoreResult, wallet::entry_tags::EntryTags};
-
 #[cfg(feature = "vdrtools_wallet")]
 use vdrtools::WalletRecord;
 
+use crate::{errors::error::VcxCoreResult, wallet::entry_tags::EntryTags};
+
 #[derive(Debug, Default, Clone, TypedBuilder)]
 pub struct Record {
     category: String,

aries/aries_vcx_core/src/wallet/base_wallet/record_wallet.rs

@@ -2,9 +2,8 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 
-use crate::{errors::error::VcxCoreResult, wallet::entry_tags::EntryTags};
-
 use super::{record::Record, search_filter::SearchFilter, BaseWallet};
+use crate::{errors::error::VcxCoreResult, wallet::entry_tags::EntryTags};
 
 #[async_trait]
 pub trait RecordWallet {

aries/aries_vcx_core/src/wallet/indy/mod.rs

@@ -3,7 +3,6 @@ use indy_api_types::domain::wallet::{default_key_derivation_method, IndyRecord};
 use vdrtools::{indy_wallet::iterator::WalletIterator, Locator};
 
 use self::indy_tags::IndyTags;
-
 use super::base_wallet::{
     did_wallet::DidWallet,
     issuer_config::IssuerConfig,

aries/aries_vcx_core/src/wallet/indy/restore_wallet_configs.rs

@@ -1,12 +1,9 @@
 use async_trait::async_trait;
-use vdrtools::types::domain::wallet::default_key_derivation_method;
-
 use serde::{Deserialize, Serialize};
-use vdrtools::Locator;
-
-use crate::{errors::error::VcxCoreResult, wallet::base_wallet::ImportWallet};
+use vdrtools::{types::domain::wallet::default_key_derivation_method, Locator};
 
 use super::indy_utils::parse_key_derivation_method;
+use crate::{errors::error::VcxCoreResult, wallet::base_wallet::ImportWallet};
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct RestoreWalletConfigs {

aries/aries_vcx_core/src/wallet/indy/wallet_config.rs

@@ -6,13 +6,12 @@ use serde::{Deserialize, Serialize};
 use typed_builder::TypedBuilder;
 use vdrtools::Locator;
 
+use super::{indy_utils::parse_key_derivation_method, BaseWallet};
 use crate::{
     errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult},
     wallet::{base_wallet::ManageWallet, indy::IndySdkWallet},
 };
 
-use super::{indy_utils::parse_key_derivation_method, BaseWallet};
-
 #[derive(Clone, Debug, TypedBuilder, Serialize, Deserialize)]
 #[builder(field_defaults(default))]
 pub struct WalletConfig {
@@ -38,10 +37,24 @@ pub struct WalletConfig {
 
 #[async_trait]
 impl ManageWallet for WalletConfig {
-    async fn create_wallet(&self) -> VcxCoreResult<Arc<dyn BaseWallet>> {
-        let handle = Locator::instance()
+    async fn create_wallet(&self) -> VcxCoreResult<()> {
+        let credentials = vdrtools::types::domain::wallet::Credentials {
+            key: self.wallet_key.clone(),
+            key_derivation_method: parse_key_derivation_method(&self.wallet_key_derivation)?,
+
+            rekey: None,
+            rekey_derivation_method: default_key_derivation_method(),
+
+            storage_credentials: self
+                .storage_credentials
+                .as_deref()
+                .map(serde_json::from_str)
+                .transpose()?,
+        };
+
+        let res = Locator::instance()
             .wallet_controller
-            .open(
+            .create(
                 vdrtools::types::domain::wallet::Config {
                     id: self.wallet_name.clone(),
                     storage_type: self.wallet_type.clone(),
@@ -52,30 +65,26 @@ impl ManageWallet for WalletConfig {
                         .transpose()?,
                     cache: None,
                 },
-                vdrtools::types::domain::wallet::Credentials {
-                    key: self.wallet_key.clone(),
-                    key_derivation_method: parse_key_derivation_method(
-                        &self.wallet_key_derivation,
-                    )?,
-
-                    rekey: self.rekey.clone(),
-                    rekey_derivation_method: self
-                        .rekey_derivation_method
-                        .as_deref()
-                        .map(parse_key_derivation_method)
-                        .transpose()?
-                        .unwrap_or_else(default_key_derivation_method),
-
-                    storage_credentials: self
-                        .storage_credentials
-                        .as_deref()
-                        .map(serde_json::from_str)
-                        .transpose()?,
-                },
+                credentials,
             )
-            .await?;
+            .await;
 
-        Ok(Arc::new(IndySdkWallet::new(handle)))
+        match res {
+            Ok(()) => Ok(()),
+
+            Err(err) if err.kind() == IndyErrorKind::WalletAlreadyExists => {
+                warn!(
+                    "wallet \"{}\" already exists. skipping creation",
+                    self.wallet_name
+                );
+                Ok(())
+            }
+
+            Err(err) => Err(AriesVcxCoreError::from_msg(
+                AriesVcxCoreErrorKind::WalletCreate,
+                format!("could not create wallet {}: {}", self.wallet_name, err,),
+            )),
+        }
     }
 
     async fn open_wallet(&self) -> VcxCoreResult<Arc<dyn BaseWallet>> {

aries/misc/legacy/libvcx_core/src/api_vcx/api_global/wallet.rs

@@ -8,7 +8,6 @@ use aries_vcx::{
     global::settings::DEFAULT_LINK_SECRET_ALIAS,
     protocols::mediated_connection::pairwise_info::PairwiseInfo,
 };
-
 use aries_vcx_core::{
     errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind},
     wallet::{
@@ -280,7 +279,7 @@ pub async fn wallet_search_records(xtype: &str, query_json: &str) -> LibvcxResul
 
     let indy_records = records
         .into_iter()
-        .map(|record| IndyWalletRecord::from_record(record))
+        .map(IndyWalletRecord::from_record)
         .collect::<Result<Vec<_>, _>>()?;
 
     let res = serde_json::to_string(&indy_records)
@@ -296,10 +295,10 @@ pub async fn wallet_import(config: &RestoreWalletConfigs) -> LibvcxResult<()> {
 pub async fn wallet_migrate(wallet_config: &WalletConfig) -> LibvcxResult<()> {
     let src_wallet = get_main_wallet()?;
     info!("Assuring target wallet exists.");
-    let dest_wallet = wallet_config.create_wallet().await?;
+    wallet_config.create_wallet().await?;
+    let dest_wallet = wallet_config.open_wallet().await?;
     info!("Opening target wallet.");
 
-    let dest_wallet: Arc<_> = dest_wallet.into();
     let migration_res = wallet_migrator::migrate_wallet(
         src_wallet,
         dest_wallet,
@@ -436,7 +435,6 @@ mod tests {
         }))
         .unwrap();
 
-        #[cfg(feature("vdrtools_wallet"))]
         super::wallet_migrate(&new_config).await.unwrap();
     }
 

aries/misc/legacy/libvdrtools/indy-wallet/src/lib.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use indy_api_types::{
-    domain::wallet::{CacheConfig, Config, Credentials, ExportConfig, IndyRecord, Tags},
+    domain::wallet::{CacheConfig, Config, Credentials, ExportConfig, Tags},
     errors::prelude::*,
     WalletHandle,
 };
@@ -17,7 +17,7 @@ use indy_utils::{
     secret,
 };
 use iterator::WalletIterator;
-use log::{error, info, trace, warn};
+use log::trace;
 use serde::{Deserialize, Serialize};
 use serde_json::Value as SValue;
 
@@ -43,14 +43,6 @@ mod cache;
 mod export_import;
 mod wallet;
 
-#[derive(Debug)]
-pub struct MigrationResult {
-    migrated: u32,
-    skipped: u32,
-    duplicated: u32,
-    failed: u32,
-}
-
 #[allow(clippy::type_complexity)]
 pub struct WalletService {
     storage_types: Mutex<HashMap<String, Arc<dyn WalletStorageType>>>,

aries/misc/legacy/libvdrtools/indy-wallet/src/wallet.rs

@@ -30,6 +30,7 @@ pub struct Keys {
     pub tags_hmac_key: hmacsha256::Key,
 }
 
+#[allow(clippy::new_without_default)]
 impl Keys {
     pub fn new() -> Keys {
         Keys {