addressed review comments

Author: Roee-87

sdk/tests/data/records.ts

@@ -0,0 +1,12 @@
+const RECORD_CIPHERTEXT_STRING = "record1qyqsqpe2szk2wwwq56akkwx586hkndl3r8vzdwve32lm7elvphh37rsyqyxx66trwfhkxun9v35hguerqqpqzqrtjzeu6vah9x2me2exkgege824sd8x2379scspmrmtvczs0d93qttl7y92ga0k0rsexu409hu3vlehe3yxjhmey3frh2z5pxm5cmxsv4un97q";
+const RECORD_CIPHERTEXT_STRING_COPY = "record1qyqsqpe2szk2wwwq56akkwx586hkndl3r8vzdwve32lm7elvphh37rsyqyxx66trwfhkxun9v35hguerqqpqzqrtjzeu6vah9x2me2exkgege824sd8x2379scspmrmtvczs0d93qttl7y92ga0k0rsexu409hu3vlehe3yxjhmey3frh2z5pxm5cmxsv4un97q";
+const RECORD_CIPHERTEXT_STRING_NOT_OWNED = "RECORD1QVQSQ5H8YT5682E73ZT7PYNJGPL29MWTSETRVS9VHCKFHJRNX9RX94CFQYXX66TRWFHKXUN9V35HGUERQQPQZQZ6KMY7S5HPKKF02L6R46QM8RQCW9X0K4RQ6GT234AMJ2UG3LMTQT5NY4UG8SXJY3U8D05K4Q3E9F54VX67ZMD3G6JYQQ7KXRWS0R0SWM6P833";
+const RECORD_CIPHERTEXT_STRING_NOT_OWNED2 = "RECORD1QVQSP37HJE4CEU8EFZE8XMAHE5TDTXCZ0K534WQPKVN6C9R629X3C4Q8QYRXZMT0W4H8GGCQQGQSPVUJYCN0K7HYFHENXA40HXTFSX68092WMVJ4E3XSEXR2DY0FMCCXT0DS42W5MAASZFJV930QVQRKATQJ900AKU4K777UMH2K54ZHLUGQC2AFJD";
+
+const RECORD_PLAINTEXT_STRING = `{
+    owner: aleo1j7qxyunfldj2lp8hsvy7mw5k8zaqgjfyr72x2gh3x4ewgae8v5gscf5jh3.private,
+      microcredits: 1500000000000000u64.private,
+      _nonce: 3077450429259593211617823051143573281856129402760267155982965992208217472983group.public
+    }`;
+
+export {RECORD_CIPHERTEXT_STRING, RECORD_CIPHERTEXT_STRING_COPY, RECORD_CIPHERTEXT_STRING_NOT_OWNED, RECORD_CIPHERTEXT_STRING_NOT_OWNED2, RECORD_PLAINTEXT_STRING};

sdk/tests/wasm.test.ts

@@ -11,6 +11,13 @@ import {
     recordPlaintextString,
     beaconPrivateKeyString
 } from "./data/account-data.js";
+import {
+    RECORD_CIPHERTEXT_STRING,
+    RECORD_CIPHERTEXT_STRING_COPY,
+    RECORD_CIPHERTEXT_STRING_NOT_OWNED,
+    RECORD_CIPHERTEXT_STRING_NOT_OWNED2,
+    RECORD_PLAINTEXT_STRING,
+} from "./data/records.js";
 
 
 describe('WASM Objects', () => {
@@ -440,28 +447,18 @@ describe('WASM Objects', () => {
     }
 });
 
-
     describe('EncryptionToolkit', () => {
-        const recordCiphertextString = "record1qyqsqpe2szk2wwwq56akkwx586hkndl3r8vzdwve32lm7elvphh37rsyqyxx66trwfhkxun9v35hguerqqpqzqrtjzeu6vah9x2me2exkgege824sd8x2379scspmrmtvczs0d93qttl7y92ga0k0rsexu409hu3vlehe3yxjhmey3frh2z5pxm5cmxsv4un97q";
-        const recordCiphertextStringCopy = "record1qyqsqpe2szk2wwwq56akkwx586hkndl3r8vzdwve32lm7elvphh37rsyqyxx66trwfhkxun9v35hguerqqpqzqrtjzeu6vah9x2me2exkgege824sd8x2379scspmrmtvczs0d93qttl7y92ga0k0rsexu409hu3vlehe3yxjhmey3frh2z5pxm5cmxsv4un97q";
-        const recordCiphertextStringNotOwned = "RECORD1QVQSQ5H8YT5682E73ZT7PYNJGPL29MWTSETRVS9VHCKFHJRNX9RX94CFQYXX66TRWFHKXUN9V35HGUERQQPQZQZ6KMY7S5HPKKF02L6R46QM8RQCW9X0K4RQ6GT234AMJ2UG3LMTQT5NY4UG8SXJY3U8D05K4Q3E9F54VX67ZMD3G6JYQQ7KXRWS0R0SWM6P833";
-        const recordCiphertextStringNotOwned2 = "RECORD1QVQSP37HJE4CEU8EFZE8XMAHE5TDTXCZ0K534WQPKVN6C9R629X3C4Q8QYRXZMT0W4H8GGCQQGQSPVUJYCN0K7HYFHENXA40HXTFSX68092WMVJ4E3XSEXR2DY0FMCCXT0DS42W5MAASZFJV930QVQRKATQJ900AKU4K777UMH2K54ZHLUGQC2AFJD";
-        const recordCiphertext = RecordCiphertext.fromString(recordCiphertextString);
-        const recordCiphertextNotOwned = RecordCiphertext.fromString(recordCiphertextStringNotOwned);
-        const recordCiphertextNotOwned2 = RecordCiphertext.fromString(recordCiphertextStringNotOwned2);
+        const recordCiphertext = RecordCiphertext.fromString(RECORD_CIPHERTEXT_STRING);
+        const recordCiphertextNotOwned = RecordCiphertext.fromString(RECORD_CIPHERTEXT_STRING_NOT_OWNED);
+        const recordCiphertextNotOwned2 = RecordCiphertext.fromString(RECORD_CIPHERTEXT_STRING_NOT_OWNED2);
         const recordCiphertextArray = [recordCiphertext, recordCiphertextNotOwned, recordCiphertextNotOwned2];
         // Create copies of the record ciphertexts
-        const recordCiphertextCopy1 = RecordCiphertext.fromString(recordCiphertextString);
-        const recordCiphertextNotOwnedCopy1 = RecordCiphertext.fromString(recordCiphertextStringNotOwned);
-        const recordCiphertextNotOwned2Copy1 = RecordCiphertext.fromString(recordCiphertextStringNotOwned2);
+        const recordCiphertextCopy1 = RecordCiphertext.fromString(RECORD_CIPHERTEXT_STRING_COPY);
+        const recordCiphertextNotOwnedCopy1 = RecordCiphertext.fromString(RECORD_CIPHERTEXT_STRING_NOT_OWNED);
+        const recordCiphertextNotOwned2Copy1 = RecordCiphertext.fromString(RECORD_CIPHERTEXT_STRING_NOT_OWNED2);
         const recordCiphertextArrayCopy = [recordCiphertextCopy1, recordCiphertextNotOwnedCopy1, recordCiphertextNotOwned2Copy1];
-        const recordPlaintextString = `{
-owner: aleo1j7qxyunfldj2lp8hsvy7mw5k8zaqgjfyr72x2gh3x4ewgae8v5gscf5jh3.private,
-  microcredits: 1500000000000000u64.private,
-  _nonce: 3077450429259593211617823051143573281856129402760267155982965992208217472983group.public
-}`;
-        const recordPlaintext = RecordPlaintext.fromString(recordPlaintextString);
-        const recordPlaintextCopy = RecordPlaintext.fromString(recordPlaintextString);
+        const recordPlaintext = RecordPlaintext.fromString(RECORD_PLAINTEXT_STRING);
+        const recordPlaintextCopy = RecordPlaintext.fromString(RECORD_PLAINTEXT_STRING);
         const viewKeyString = "AViewKey1ccEt8A2Ryva5rxnKcAbn7wgTaTsb79tzkKHFpeKsm9NX";
         const viewKey = ViewKey.from_string(viewKeyString);
         const recordViewKeyString = "4445718830394614891114647247073357094867447866913203502139893824059966201724field";
@@ -484,13 +481,12 @@ owner: aleo1j7qxyunfldj2lp8hsvy7mw5k8zaqgjfyr72x2gh3x4ewgae8v5gscf5jh3.private,
         it('can check if a record ciphertext from an array of record ciphertexts is owned by a view key', () => {
             const ownedRecords = EncryptionToolkit.checkOwnedRecords(viewKey, recordCiphertextArray);
             // Ensure the record ciphertext is owned by the view key
-            expect(ownedRecords[0].toString()).equal(recordCiphertextStringCopy.toString());
+            expect(ownedRecords[0].toString()).equal(RECORD_CIPHERTEXT_STRING_COPY.toString());
         });
         it('can decrypt a record ciphertext from an array of record ciphertexts', () => {
             const decryptedRecords = EncryptionToolkit.decryptOwnedRecords(viewKey, recordCiphertextArrayCopy);
             // Ensure the decrypted record is the same as the plaintext
             expect(decryptedRecords[0].toString()).equal(recordPlaintextCopy.toString());
         });
-
     });
 });

wasm/src/utilities/encrypt.rs

@@ -226,9 +226,10 @@ impl EncryptionToolkit {
         // Use Rayon to parallelize the decryption process and store successful decryptions.
         let decrypted_records: Vec<RecordPlaintext> = records
             .par_iter()
-            .filter_map(|record| match try_decrypt_single_record(view_key, record) {
-                Ok(plaintext) => Some(plaintext),
-                Err(_) => None,
+            .filter_map(|record| {
+                let record_vk = Self::generate_record_view_key(view_key, record).ok()?;
+                let decrypted_record = Self::decrypt_record_symmetric_unchecked(&record_vk, record).ok()?;
+                Some(decrypted_record)
             })
             .collect();
 
@@ -237,8 +238,8 @@ impl EncryptionToolkit {
 
     /// Checks if a record ciphertext is owned by the given view key.
     ///
-    /// @param {ViewKey} view_key The view key of the owner of the records.
-    /// @param {Vec<RecordCiphertext>} records The record ciphertexts to check ownership.
+    /// @param {ViewKey} view_key View key of the owner of the records.
+    /// @param {Vec<RecordCiphertext>} records The record ciphertexts for which to check ownership.
     ///
     /// @returns {Vec<RecordCiphertext>} The record ciphertexts that are owned by the view key.
     #[wasm_bindgen(js_name = "checkOwnedRecords")]
@@ -254,18 +255,6 @@ impl EncryptionToolkit {
     }
 }
 
-// Private helper method within the impl block to decrypt
-fn try_decrypt_single_record(view_key: &ViewKey, record: &RecordCiphertext) -> Result<RecordPlaintext, String> {
-    // Generate the record view key using the owner's view key
-    let record_vk = EncryptionToolkit::generate_record_view_key(view_key, record)
-        .map_err(|_| "Failed to generate record view key".to_string())?;
-
-    // Attempt to decrypt the record using the generated record view key
-    let decryption_attempt = EncryptionToolkit::decrypt_record_symmetric_unchecked(&record_vk, record)
-        .map_err(|_| "Failed to decrypt record".to_string())?;
-
-    Ok(decryption_attempt)
-}
 
 #[cfg(test)]
 mod tests {