Field name cleanup

Author: mvines

token/program-2022-test/tests/confidential_transfer.rs

@@ -23,26 +23,26 @@ struct ConfidentialTransferMintWithKeypairs {
     ct_mint: ConfidentialTransferMint,
     ct_mint_authority: Keypair,
     #[allow(dead_code)]
-    ct_mint_auditor: ElGamalKeypair,
+    ct_mint_transfer_auditor: ElGamalKeypair,
     #[allow(dead_code)]
     ct_mint_withdraw_withheld_authority: ElGamalKeypair,
 }
 
 impl ConfidentialTransferMintWithKeypairs {
     fn new() -> Self {
         let ct_mint_authority = Keypair::new();
-        let ct_mint_auditor = ElGamalKeypair::new_rand();
+        let ct_mint_transfer_auditor = ElGamalKeypair::new_rand();
         let ct_mint_withdraw_withheld_authority = ElGamalKeypair::new_rand();
         let ct_mint = ConfidentialTransferMint {
             authority: ct_mint_authority.pubkey().into(),
             auto_approve_new_accounts: true.into(),
-            auditor_pubkey: ct_mint_auditor.public.into(),
-            withdraw_withheld_authority_pubkey: ct_mint_withdraw_withheld_authority.public.into(),
+            transfer_auditor: ct_mint_transfer_auditor.public.into(),
+            withdraw_withheld_authority: ct_mint_withdraw_withheld_authority.public.into(),
         };
         Self {
             ct_mint,
             ct_mint_authority,
-            ct_mint_auditor,
+            ct_mint_transfer_auditor,
             ct_mint_withdraw_withheld_authority,
         }
     }

token/program-2022/src/extension/confidential_transfer/mod.rs

@@ -39,14 +39,14 @@ pub struct ConfidentialTransferMint {
     /// * If non-zero, transfers must include ElGamal cypertext with this public key permitting the
     /// auditor to decode the transfer amount.
     /// * If all zero, auditing is currently disabled.
-    pub auditor_pubkey: pod::ElGamalPubkey,
+    pub transfer_auditor: pod::ElGamalPubkey,
 
     /// * If non-zero, transfers must include ElGamal cypertext of the transfer fee with this
     /// public key. If this is the case, but the base mint is not extended for fees, then any
     /// transfer will fail.
     /// * If all zero, transfer fee is disabled. If this is the case, but the base mint is extended
     /// for fees, then any transfer will fail.
-    pub withdraw_withheld_authority_pubkey: pod::ElGamalPubkey,
+    pub withdraw_withheld_authority: pod::ElGamalPubkey,
 }
 
 impl Extension for ConfidentialTransferMint {

token/program-2022/src/extension/confidential_transfer/processor.rs

@@ -470,13 +470,12 @@ fn process_transfer(
             &previous_instruction,
         )?;
 
-        if proof_data.transfer_with_fee_pubkeys.auditor != ct_mint.auditor_pubkey {
+        if proof_data.transfer_with_fee_pubkeys.auditor != ct_mint.transfer_auditor {
             return Err(TokenError::ConfidentialTransferElGamalPubkeyMismatch.into());
         }
 
         // `withdraw_withheld_authority` ElGamal pubkey in proof data and mint must match
-        if proof_data.transfer_with_fee_pubkeys.fee_collector
-            != ct_mint.withdraw_withheld_authority_pubkey
+        if proof_data.transfer_with_fee_pubkeys.fee_collector != ct_mint.withdraw_withheld_authority
         {
             return Err(TokenError::ConfidentialTransferElGamalPubkeyMismatch.into());
         }
@@ -558,7 +557,7 @@ fn process_transfer(
             &previous_instruction,
         )?;
 
-        if proof_data.transfer_pubkeys.auditor != ct_mint.auditor_pubkey {
+        if proof_data.transfer_pubkeys.auditor != ct_mint.transfer_auditor {
             return Err(TokenError::ConfidentialTransferElGamalPubkeyMismatch.into());
         }