retrieveType was not working in search

Signed-off-by: Darko Kulic <[email protected]>

Author: dkulic

libindy/src/services/wallet/iterator.rs

@@ -35,7 +35,12 @@ impl WalletIterator {
 
             let tags = decrypt_tags(&next_storage_entity.tags, &self.keys.tag_name_key, &self.keys.tag_value_key)?;
 
-            Ok(Some(WalletRecord::new(name, None, value, tags)))
+            let type_ = match next_storage_entity.type_ {
+                None => None,
+                Some(encrypted_type) => Some(String::from_utf8(decrypt(&encrypted_type, &self.keys.type_key)?)?)
+            };
+
+            Ok(Some(WalletRecord::new(name, type_, value, tags)))
         } else { Ok(None) }
     }
 

libindy/src/services/wallet/mod.rs

@@ -526,7 +526,7 @@ impl WalletService {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct WalletRecord {
     #[serde(rename = "id")]
     name: String,

libindy/src/services/wallet/wallet.rs

@@ -747,17 +747,31 @@ mod tests {
     #[test]
     fn wallet_search_empty_query_with_count() {
         _cleanup();
+
+        let type_ = "test_type_";
+        let name = "foo";
+        let value = "bar";
+        let tags = r#"{"tag1":"tag_value1"}"#;
+
         let wallet = _create_wallet();
-        wallet.add("test_type_", "foo", "bar", r#"{"tag1":"tags2"}"#).unwrap();
-        let fetch_options = &_search_options(true, true, false, true, false);
+
+        wallet.add(type_, name, value, tags).unwrap();
+        let fetch_options = &_search_options(true, true, true, true, true);
 
         // successful encrypted search
         let query_json = "{}";
         let mut iterator = wallet.search("test_type_", query_json, Some(fetch_options)).unwrap();
 
         let res = iterator.next().unwrap().unwrap();
-        assert_eq!(res.name, "foo".to_string());
-        assert_eq!(res.value.unwrap(), "bar".to_string());
+
+        let exp_tags: HashMap<String, String> = serde_json::from_str(tags).unwrap();
+        let expected = WalletRecord{
+            name: name.to_string(),
+            value: Some(value.to_string()),
+            tags: Some(exp_tags),
+            type_: Some(type_.to_string()),
+        };
+        assert_eq!(res, expected);
 
         let res = iterator.next().unwrap();
         assert!(res.is_none());