address review comments

Signed-off-by: Ondrej Prazak <[email protected]>
openwallet-foundation · Jan 26, 2024 · 6c138c9 · 6c138c9
1 parent 8774af6
commit 6c138c9
Show file tree

Hide file tree

Showing 12 changed files with 207 additions and 192 deletions.
diff --git a/aries/aries_vcx_core/src/anoncreds/credx_anoncreds.rs b/aries/aries_vcx_core/src/anoncreds/credx_anoncreds.rs
@@ -30,9 +30,9 @@ use crate::{
         json::{AsTypeOrDeserializationError, TryGetIndex},
     },
     wallet::{
-        base_wallet::{BaseWallet, Record, RecordWallet, SearchFilter},
+        base_wallet::{record::Record, search_filter::SearchFilter, BaseWallet, RecordWallet},
         entry_tag::EntryTags,
-        indy::IndyTags,
+        indy::indy_tag::IndyTags,
     },
 };
 
@@ -1035,7 +1035,7 @@ impl BaseAnonCreds for IndyCredxAnonCreds {
             .name(credential_id.clone())
             .category(CATEGORY_CREDENTIAL.into())
             .value(record_value)
-            .tags(IndyTags::new(tags_map).to_entry_tags())
+            .tags(IndyTags::new(tags_map).into_entry_tags())
             .build();
 
         wallet.add_record(record).await?;

diff --git a/aries/aries_vcx_core/src/wallet/agency_client_wallet.rs b/aries/aries_vcx_core/src/wallet/agency_client_wallet.rs
@@ -8,7 +8,10 @@ use async_trait::async_trait;
 use public_key::{Key, KeyType};
 
 use super::{
-    base_wallet::{BaseWallet, DidData, DidWallet, Record, RecordWallet, SearchFilter},
+    base_wallet::{
+        did_data::DidData, record::Record, search_filter::SearchFilter, BaseWallet, DidWallet,
+        RecordWallet,
+    },
     structs_io::UnpackMessageOutput,
 };
 use crate::{
@@ -78,12 +81,12 @@ impl DidWallet for AgencyClientWallet {
         method_name: Option<&str>,
     ) -> VcxCoreResult<DidData> {
         Err(unimplemented_agency_client_wallet_method(
-            "create_nad_store_my_did",
+            "create_and_store_my_did",
         ))
     }
 
     async fn key_for_did(&self, name: &str) -> VcxCoreResult<Key> {
-        Err(unimplemented_agency_client_wallet_method("did_key"))
+        Err(unimplemented_agency_client_wallet_method("key_for_did"))
     }
 
     async fn replace_did_key_start(&self, did: &str, seed: Option<&str>) -> VcxCoreResult<Key> {

diff --git a/aries/aries_vcx_core/src/wallet/base_wallet/did_data.rs b/aries/aries_vcx_core/src/wallet/base_wallet/did_data.rs
@@ -0,0 +1,25 @@
+use public_key::Key;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct DidData {
+    did: String,
+    verkey: Key,
+}
+
+impl DidData {
+    pub fn new(did: &str, verkey: Key) -> Self {
+        Self {
+            did: did.into(),
+            verkey,
+        }
+    }
+
+    pub fn did(&self) -> &str {
+        &self.did
+    }
+
+    pub fn verkey(&self) -> &Key {
+        &self.verkey
+    }
+}
diff --git a/.../aries_vcx_core/src/wallet/base_wallet.rs → ...es_vcx_core/src/wallet/base_wallet/mod.rs b/.../aries_vcx_core/src/wallet/base_wallet.rs → ...es_vcx_core/src/wallet/base_wallet/mod.rs
@@ -1,90 +1,18 @@
 use async_trait::async_trait;
-#[cfg(feature = "vdrtools_wallet")]
-use indy_api_types::domain::wallet::IndyRecord;
 use public_key::Key;
-use serde::{Deserialize, Serialize};
-use typed_builder::TypedBuilder;
-
-use super::{entry_tag::EntryTags, indy::IndyTags};
-use crate::{errors::error::VcxCoreResult, wallet::structs_io::UnpackMessageOutput};
-
-#[derive(Debug, Default, Clone, TypedBuilder)]
-pub struct Record {
-    category: String,
-    name: String,
-    value: String,
-    #[builder(default)]
-    tags: EntryTags,
-}
-
-impl Record {
-    pub fn value(&self) -> &str {
-        &self.value
-    }
 
-    pub fn name(&self) -> &str {
-        &self.name
-    }
+use super::entry_tag::EntryTags;
+use crate::{
+    errors::error::VcxCoreResult,
+    wallet::{
+        base_wallet::{did_data::DidData, record::Record, search_filter::SearchFilter},
+        structs_io::UnpackMessageOutput,
+    },
+};
 
-    pub fn category(&self) -> &str {
-        &self.category
-    }
-
-    pub fn tags(&self) -> &EntryTags {
-        &self.tags
-    }
-}
-
-#[cfg(feature = "vdrtools_wallet")]
-impl From<IndyRecord> for Record {
-    fn from(ir: IndyRecord) -> Self {
-        Self {
-            name: ir.id,
-            category: ir.type_,
-            value: ir.value,
-            tags: IndyTags::new(ir.tags).to_entry_tags(),
-        }
-    }
-}
-
-#[cfg(feature = "vdrtools_wallet")]
-impl From<Record> for IndyRecord {
-    fn from(record: Record) -> Self {
-        Self {
-            id: record.name,
-            type_: record.category,
-            value: record.value,
-            tags: IndyTags::from_entry_tags(record.tags).to_inner(),
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-pub struct DidData {
-    did: String,
-    verkey: Key,
-}
-
-impl DidData {
-    pub fn new(did: &str, verkey: Key) -> Self {
-        Self {
-            did: did.into(),
-            verkey,
-        }
-    }
-
-    pub fn did(&self) -> &str {
-        &self.did
-    }
-
-    pub fn verkey(&self) -> &Key {
-        &self.verkey
-    }
-}
-
-pub enum SearchFilter {
-    JsonFilter(String),
-}
+pub mod did_data;
+pub mod record;
+pub mod search_filter;
 
 pub trait BaseWallet: RecordWallet + DidWallet + Send + Sync + std::fmt::Debug {}
 
@@ -201,9 +129,9 @@ mod tests {
             .unwrap();
 
         let msg = "sign this".as_bytes();
-        let sig = wallet.sign(&did_data.verkey, msg).await.unwrap();
+        let sig = wallet.sign(did_data.verkey(), msg).await.unwrap();
 
-        let res = wallet.verify(&did_data.verkey, msg, &sig).await.unwrap();
+        let res = wallet.verify(did_data.verkey(), msg, &sig).await.unwrap();
         assert!(res);
     }
 
@@ -216,18 +144,18 @@ mod tests {
             .await
             .unwrap();
 
-        let key = wallet.key_for_did(&did_data.did).await.unwrap();
+        let key = wallet.key_for_did(did_data.did()).await.unwrap();
 
-        assert_eq!(did_data.verkey, key);
+        assert_eq!(did_data.verkey(), &key);
 
         let res = wallet
-            .replace_did_key_start(&did_data.did, Some(&random_seed()))
+            .replace_did_key_start(did_data.did(), Some(&random_seed()))
             .await
             .unwrap();
 
-        wallet.replace_did_key_apply(&did_data.did).await.unwrap();
+        wallet.replace_did_key_apply(did_data.did()).await.unwrap();
 
-        let new_key = wallet.key_for_did(&did_data.did).await.unwrap();
+        let new_key = wallet.key_for_did(did_data.did()).await.unwrap();
         assert_eq!(res, new_key);
     }
 
@@ -243,8 +171,8 @@ mod tests {
 
         let packed = wallet
             .pack_message(
-                Some(sender_data.verkey),
-                vec![receiver_data.verkey],
+                Some(sender_data.verkey().clone()),
+                vec![receiver_data.verkey().clone()],
                 msg.as_bytes(),
             )
             .await
@@ -279,7 +207,7 @@ mod tests {
 
         let res = wallet.get_record(category, name).await.unwrap();
 
-        assert_eq!(value, res.value);
+        assert_eq!(value, res.value());
     }
 
     #[tokio::test]
@@ -300,7 +228,7 @@ mod tests {
 
         let res = wallet.get_record(category, name).await.unwrap();
 
-        assert_eq!(value, res.value);
+        assert_eq!(value, res.value());
 
         wallet.delete_record(category, name).await.unwrap();
 
@@ -374,8 +302,8 @@ mod tests {
             .unwrap();
 
         let res = wallet.get_record(category, name).await.unwrap();
-        assert_eq!(value2, res.value);
-        assert_eq!(tags2, res.tags);
+        assert_eq!(value2, res.value());
+        assert_eq!(&tags2, res.tags());
     }
 
     #[tokio::test]
@@ -402,8 +330,8 @@ mod tests {
             .unwrap();
 
         let res = wallet.get_record(category, name).await.unwrap();
-        assert_eq!(value2, res.value);
-        assert_eq!(tags, res.tags);
+        assert_eq!(value2, res.value());
+        assert_eq!(&tags, res.tags());
     }
 
     #[tokio::test]
@@ -430,7 +358,7 @@ mod tests {
             .unwrap();
 
         let res = wallet.get_record(category, name).await.unwrap();
-        assert_eq!(value, res.value);
-        assert_eq!(tags2, res.tags);
+        assert_eq!(value, res.value());
+        assert_eq!(&tags2, res.tags());
     }
 }
diff --git a/aries/aries_vcx_core/src/wallet/base_wallet/record.rs b/aries/aries_vcx_core/src/wallet/base_wallet/record.rs
@@ -0,0 +1,30 @@
+use typed_builder::TypedBuilder;
+
+use crate::wallet::entry_tag::EntryTags;
+
+#[derive(Debug, Default, Clone, TypedBuilder)]
+pub struct Record {
+    category: String,
+    name: String,
+    value: String,
+    #[builder(default)]
+    tags: EntryTags,
+}
+
+impl Record {
+    pub fn value(&self) -> &str {
+        &self.value
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    pub fn category(&self) -> &str {
+        &self.category
+    }
+
+    pub fn tags(&self) -> &EntryTags {
+        &self.tags
+    }
+}
diff --git a/aries/aries_vcx_core/src/wallet/base_wallet/search_filter.rs b/aries/aries_vcx_core/src/wallet/base_wallet/search_filter.rs
@@ -0,0 +1,3 @@
+pub enum SearchFilter {
+    JsonFilter(String),
+}
diff --git a/aries/aries_vcx_core/src/wallet/indy/indy_did_wallet.rs b/aries/aries_vcx_core/src/wallet/indy/indy_did_wallet.rs
@@ -5,7 +5,7 @@ use vdrtools::{DidMethod, DidValue, KeyInfo, Locator, MyDidInfo};
 use crate::{
     errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult},
     wallet::{
-        base_wallet::{DidData, DidWallet},
+        base_wallet::{did_data::DidData, DidWallet},
         indy::IndySdkWallet,
         structs_io::UnpackMessageOutput,
     },

diff --git a/aries/aries_vcx_core/src/wallet/indy/indy_record_wallet.rs b/aries/aries_vcx_core/src/wallet/indy/indy_record_wallet.rs
@@ -4,11 +4,11 @@ use serde::Deserialize;
 use serde_json::Value;
 use vdrtools::Locator;
 
-use super::{IndyTags, SEARCH_OPTIONS, WALLET_OPTIONS};
+use super::{indy_tag::IndyTags, SEARCH_OPTIONS, WALLET_OPTIONS};
 use crate::{
     errors::error::{AriesVcxCoreError, VcxCoreResult},
     wallet::{
-        base_wallet::{Record, RecordWallet, SearchFilter},
+        base_wallet::{record::Record, search_filter::SearchFilter, RecordWallet},
         entry_tag::EntryTags,
         indy::IndySdkWallet,
     },
@@ -20,7 +20,7 @@ impl RecordWallet for IndySdkWallet {
         let tags_map = if record.tags().is_empty() {
             None
         } else {
-            Some(IndyTags::from_entry_tags(record.tags().clone()).to_inner())
+            Some(IndyTags::from_entry_tags(record.tags().clone()).into_inner())
         };
 
         Ok(Locator::instance()
@@ -63,7 +63,7 @@ impl RecordWallet for IndySdkWallet {
                 self.wallet_handle,
                 category.into(),
                 name.into(),
-                IndyTags::from_entry_tags(new_tags).to_inner(),
+                IndyTags::from_entry_tags(new_tags).into_inner(),
             )
             .await?)
     }