resolved merge conflict

Author: Roee-87

sdk/tests/wasm.test.ts

@@ -362,10 +362,8 @@ describe('WASM Objects', () => {
             expect(isOwner).equal(true);
         })
 
-        it ('cannot be decrypted with an invalid record view key', () => {
-            const foreignViewKey = ViewKey.from_string(foreignViewKeyString);
-            const badRecordViewKey = ciphertext.recordViewKey(foreignViewKey);
-
+        it('cannot be decrypted with an invalid record view key', () => {
+            const badRecordViewKey = ciphertext.recordViewKey(ViewKey.from_string(foreignViewKeyString));
             // Ensure the record ciphertext cannot be decrypted with an invalid record view key
             expect(() => ciphertext.decryptWithRecordViewKey(badRecordViewKey)).throw();
         })
@@ -458,7 +456,7 @@ owner: aleo1j7qxyunfldj2lp8hsvy7mw5k8zaqgjfyr72x2gh3x4ewgae8v5gscf5jh3.private,
         const recordViewKey = Field.fromString(recordViewKeyString);
 
         it('can generate a record view key from a view key and a record ciphertext', () => {
-            const generatedRecordViewKey = EncryptionToolkit.generateRecordViewkey(viewKey, recordCiphertext);
+            const generatedRecordViewKey = EncryptionToolkit.generateRecordViewKey(viewKey, recordCiphertext);
             // Ensure the generated record view key is the same as the one used to decrypt
             expect(generatedRecordViewKey.toString()).equal(recordViewKey.toString());
         });

wasm/src/utilities/encrypt.rs

@@ -151,7 +151,7 @@ impl EncryptionToolkit {
 
     /// Creates a record view key from the view key.  This can be later be used to decrypt a
     // record without revealing an account's view key.
-    #[wasm_bindgen(js_name = "generateRecordViewkey")]
+    #[wasm_bindgen(js_name = "generateRecordViewKey")]
     pub fn generate_record_view_key(view_key: &ViewKey, record_ciphertext: &RecordCiphertext) -> Result<Field, String> {
         let record_nonce = record_ciphertext.nonce();
         Ok(record_nonce.scalar_multiply(&view_key.to_scalar()).to_x_coordinate())