update tests

Author: samkim-crypto

token/confidential-transfer/proof-tests/tests/proof_test.rs

@@ -7,7 +7,8 @@ use {
         transfer::TransferProofContext, transfer_with_fee::TransferWithFeeProofContext,
     },
     spl_token_confidential_transfer_proof_generation::{
-        transfer::transfer_split_proof_data, transfer_with_fee::transfer_with_fee_split_proof_data,
+        transfer::{transfer_split_proof_data, TransferProofData},
+        transfer_with_fee::{transfer_with_fee_split_proof_data, TransferWithFeeProofData},
     },
 };
 
@@ -35,7 +36,11 @@ fn test_transfer_proof_validity(spendable_balance: u64, transfer_amount: u64) {
     let spendable_ciphertext = source_keypair.pubkey().encrypt(spendable_balance);
     let decryptable_balance = aes_key.encrypt(spendable_balance);
 
-    let (equality_proof_data, validity_proof_data, range_proof_data) = transfer_split_proof_data(
+    let TransferProofData {
+        equality_proof_data,
+        ciphertext_validity_proof_data,
+        range_proof_data,
+    } = transfer_split_proof_data(
         &spendable_ciphertext,
         &decryptable_balance,
         transfer_amount,
@@ -47,12 +52,12 @@ fn test_transfer_proof_validity(spendable_balance: u64, transfer_amount: u64) {
     .unwrap();
 
     equality_proof_data.verify_proof().unwrap();
-    validity_proof_data.verify_proof().unwrap();
+    ciphertext_validity_proof_data.verify_proof().unwrap();
     range_proof_data.verify_proof().unwrap();
 
     TransferProofContext::verify_and_extract(
         equality_proof_data.context_data(),
-        validity_proof_data.context_data(),
+        ciphertext_validity_proof_data.context_data(),
         range_proof_data.context_data(),
     )
     .unwrap();
@@ -101,13 +106,13 @@ fn test_transfer_with_fee_proof_validity(
     let spendable_ciphertext = source_keypair.pubkey().encrypt(spendable_balance);
     let decryptable_balance = aes_key.encrypt(spendable_balance);
 
-    let (
+    let TransferWithFeeProofData {
         equality_proof_data,
         transfer_amount_ciphertext_validity_proof_data,
         percentage_with_cap_proof_data,
         fee_ciphertext_validity_proof_data,
         range_proof_data,
-    ) = transfer_with_fee_split_proof_data(
+    } = transfer_with_fee_split_proof_data(
         &spendable_ciphertext,
         &decryptable_balance,
         transfer_amount,

token/program-2022/Cargo.toml

@@ -12,11 +12,9 @@ exclude = ["js/**"]
 no-entrypoint = []
 test-sbf = []
 serde-traits = ["dep:serde", "dep:serde_with", "dep:base64", "spl-pod/serde-traits"]
-default = ["confidential-hook", "token-group", "zk-ops"]
+default = ["confidential-hook", "zk-ops"]
 # Remove this feature once the underlying syscalls are released on all networks
 zk-ops = []
-# Remove this feature once the token group implementation has been audited
-token-group = []
 # Remove this feature once the confidential transfer hook has been audited
 confidential-hook = []
 

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

@@ -1,5 +1,4 @@
 // Remove feature once zk ops syscalls are enabled on all networks
-#[cfg(feature = "confidential-hook")]
 use crate::extension::transfer_hook;
 #[cfg(feature = "zk-ops")]
 use {
@@ -625,7 +624,6 @@ fn process_transfer(
         authority_info
     };
 
-    #[cfg(feature = "confidential-hook")]
     if let Some(program_id) = transfer_hook::get_program_id(&mint) {
         // set transferring flags, scope the borrow to avoid double-borrow during CPI
         {

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

@@ -205,7 +205,6 @@ pub fn process_initialize_member(_program_id: &Pubkey, accounts: &[AccountInfo])
 }
 
 /// Processes an [Instruction](enum.Instruction.html).
-#[cfg(feature = "token-group")]
 pub fn process_instruction(
     program_id: &Pubkey,
     accounts: &[AccountInfo],
@@ -230,13 +229,3 @@ pub fn process_instruction(
         }
     }
 }
-
-/// Processes an [Instruction](enum.Instruction.html).
-#[cfg(not(feature = "token-group"))]
-pub fn process_instruction(
-    _program_id: &Pubkey,
-    _accounts: &[AccountInfo],
-    _instruction: TokenGroupInstruction,
-) -> ProgramResult {
-    Err(TokenError::InvalidInstruction.into())
-}