Rename ElGamal to ElGamalKeypair

zk-token-sdk/src/instruction/close_account.rs

@@ -147,12 +147,12 @@ impl CloseAccountProof {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::encryption::elgamal::ElGamal;
+    use crate::encryption::elgamal::ElGamalKeypair;
     use crate::encryption::pedersen::{Pedersen, PedersenDecryptHandle, PedersenOpening};
 
     #[test]
     fn test_close_account_correctness() {
-        let source = ElGamal::default();
+        let source = ElGamalKeypair::default();
 
         // invalid ciphertexts
         let balance = source.pk.encrypt(0_u64);

zk-token-sdk/src/instruction/transfer.rs

@@ -61,7 +61,7 @@ impl TransferData {
     ) -> Self {
         // split and encrypt transfer amount
         //
-        // encryption is a bit more involved since we are generating each components of an ElGamal
+        // encryption is a bit more involved since we are generating each components of an ElGamalKeypair
         // ciphertext separately.
         let (amount_lo, amount_hi) = split_u64_into_u32(transfer_amount);
 
@@ -463,17 +463,19 @@ pub fn combine_u32_ciphertexts(ct_lo: ElGamalCiphertext, ct_hi: ElGamalCiphertex
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::encryption::{discrete_log::decode_u32_precomputation_for_G, elgamal::ElGamal};
+    use crate::encryption::{
+        discrete_log::decode_u32_precomputation_for_G, elgamal::ElGamalKeypair,
+    };
 
     #[test]
     fn test_transfer_correctness() {
-        // ElGamal keys for source, destination, and auditor accounts
-        let ElGamal {
+        // ElGamalKeypair keys for source, destination, and auditor accounts
+        let ElGamalKeypair {
             pk: source_pk,
             sk: source_sk,
-        } = ElGamal::default();
-        let dest_pk = ElGamal::default().pk;
-        let auditor_pk = ElGamal::default().pk;
+        } = ElGamalKeypair::default();
+        let dest_pk = ElGamalKeypair::default().pk;
+        let auditor_pk = ElGamalKeypair::default().pk;
 
         // create source account spendable ciphertext
         let spendable_balance: u64 = 77;
@@ -498,16 +500,16 @@ mod test {
 
     #[test]
     fn test_source_dest_ciphertext() {
-        // ElGamal keys for source, destination, and auditor accounts
-        let ElGamal {
+        // ElGamalKeypair keys for source, destination, and auditor accounts
+        let ElGamalKeypair {
             pk: source_pk,
             sk: source_sk,
-        } = ElGamal::default();
-        let ElGamal {
+        } = ElGamalKeypair::default();
+        let ElGamalKeypair {
             pk: dest_pk,
             sk: dest_sk,
-        } = ElGamal::default();
-        let auditor_pk = ElGamal::default().pk;
+        } = ElGamalKeypair::default();
+        let auditor_pk = ElGamalKeypair::default().pk;
 
         // create source account spendable ciphertext
         let spendable_balance: u64 = 77;

zk-token-sdk/src/instruction/update_account_pk.rs

@@ -214,13 +214,13 @@ impl UpdateAccountPkProof {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::encryption::elgamal::ElGamal;
+    use crate::encryption::elgamal::ElGamalKeypair;
     use crate::encryption::pedersen::{Pedersen, PedersenDecryptHandle, PedersenOpening};
 
     #[test]
     fn test_update_account_public_key_general_cases() {
-        let current = ElGamal::default();
-        let new = ElGamal::default();
+        let current = ElGamalKeypair::default();
+        let new = ElGamalKeypair::default();
 
         // If current_ct and new_ct encrypt same values, then the proof verification should succeed
         let balance: u64 = 77;
@@ -239,8 +239,8 @@ mod test {
 
     #[test]
     fn test_update_account_public_key_zeroed_ciphertexts() {
-        let current = ElGamal::default();
-        let new = ElGamal::default();
+        let current = ElGamalKeypair::default();
+        let new = ElGamalKeypair::default();
 
         // A zeroed cipehrtext should be considered as an account balance of 0
         let balance: u64 = 0;
@@ -286,8 +286,8 @@ mod test {
 
     #[test]
     fn test_update_account_public_key_partially_zeroed_ciphertexts() {
-        let current = ElGamal::default();
-        let new = ElGamal::default();
+        let current = ElGamalKeypair::default();
+        let new = ElGamalKeypair::default();
 
         let balance = 0_u64;
         let balance_ciphertext = new.pk.encrypt(balance);

zk-token-sdk/src/instruction/withdraw.rs

@@ -173,13 +173,13 @@ impl WithdrawProof {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::encryption::elgamal::ElGamal;
+    use crate::encryption::elgamal::ElGamalKeypair;
 
     #[test]
     #[ignore]
     fn test_withdraw_correctness() {
         // generate and verify proof for the proper setting
-        let ElGamal { pk, sk } = ElGamal::default();
+        let ElGamalKeypair { pk, sk } = ElGamalKeypair::default();
 
         let current_balance: u64 = 77;
         let current_balance_ct = pk.encrypt(current_balance);