chore: remove obsolete combine logic and tests

Author: ananas-block

program-libs/compressed-account/src/instruction_data/invoke_cpi.rs

@@ -1,7 +1,6 @@
 use super::{
     cpi_context::CompressedCpiContext,
     data::{NewAddressParamsPacked, OutputCompressedAccountWithPackedContext},
-    zero_copy::ZInstructionDataInvokeCpi,
 };
 use crate::{
     compressed_account::PackedCompressedAccountWithMerkleContext,
@@ -21,99 +20,3 @@ pub struct InstructionDataInvokeCpi {
     pub is_compress: bool,
     pub cpi_context: Option<CompressedCpiContext>,
 }
-
-impl<'a, 'info: 'a> ZInstructionDataInvokeCpi<'a> {
-    pub fn combine(&mut self, other: Vec<ZInstructionDataInvokeCpi<'info>>) {
-        for other in other {
-            // TODO: support address creation with cpi context
-            // issue is that we deserialize address creation params as zero copy slice we cannot push into it
-            // could reenable by passing it as extra argument without losing performance.
-            // self.new_address_params
-            //     .extend_from_slice(&other.new_address_params);
-            for i in other.input_compressed_accounts_with_merkle_context.iter() {
-                self.input_compressed_accounts_with_merkle_context
-                    .push((*i).clone());
-            }
-            for i in other.output_compressed_accounts.iter() {
-                self.output_compressed_accounts.push((*i).clone());
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::vec;
-
-    use light_zero_copy::borsh::Deserialize;
-
-    use super::*;
-    use crate::{
-        compressed_account::PackedCompressedAccountWithMerkleContext,
-        instruction_data::{
-            data::{NewAddressParamsPacked, OutputCompressedAccountWithPackedContext},
-            invoke_cpi::InstructionDataInvokeCpi,
-            zero_copy::ZInstructionDataInvokeCpi,
-        },
-    };
-
-    // test combine instruction data transfer
-    #[test]
-    fn test_combine_instruction_data_transfer() {
-        let mut instruction_data_transfer = InstructionDataInvokeCpi {
-            proof: Some(CompressedProof {
-                a: [0; 32],
-                b: [0; 64],
-                c: [0; 32],
-            }),
-            new_address_params: vec![NewAddressParamsPacked::default()],
-            input_compressed_accounts_with_merkle_context: vec![
-                PackedCompressedAccountWithMerkleContext::default(),
-            ],
-            output_compressed_accounts: vec![OutputCompressedAccountWithPackedContext::default()],
-            relay_fee: None,
-            compress_or_decompress_lamports: Some(1),
-            is_compress: true,
-            cpi_context: None,
-        };
-        instruction_data_transfer.input_compressed_accounts_with_merkle_context[0]
-            .merkle_context
-            .leaf_index = 1;
-        instruction_data_transfer.output_compressed_accounts[0].merkle_tree_index = 1;
-        let other = InstructionDataInvokeCpi {
-            proof: Some(CompressedProof {
-                a: [0; 32],
-                b: [0; 64],
-                c: [0; 32],
-            }),
-            input_compressed_accounts_with_merkle_context: vec![
-                PackedCompressedAccountWithMerkleContext::default(),
-            ],
-            output_compressed_accounts: vec![OutputCompressedAccountWithPackedContext::default()],
-            relay_fee: None,
-            compress_or_decompress_lamports: Some(1),
-            is_compress: true,
-            new_address_params: vec![NewAddressParamsPacked::default()],
-            cpi_context: None,
-        };
-        let mut vec = Vec::new();
-        instruction_data_transfer.serialize(&mut vec).unwrap();
-        let mut other_vec = Vec::new();
-        other.serialize(&mut other_vec).unwrap();
-        let (mut instruction_data_transfer, _) =
-            ZInstructionDataInvokeCpi::zero_copy_at(&vec).unwrap();
-        let (other, _) = ZInstructionDataInvokeCpi::zero_copy_at(&other_vec).unwrap();
-        instruction_data_transfer.combine(vec![other]);
-        assert_eq!(instruction_data_transfer.new_address_params.len(), 1);
-        assert_eq!(
-            instruction_data_transfer
-                .input_compressed_accounts_with_merkle_context
-                .len(),
-            2
-        );
-        assert_eq!(
-            instruction_data_transfer.output_compressed_accounts.len(),
-            2
-        );
-    }
-}

programs/system/src/invoke_cpi/process_cpi_context.rs

@@ -233,9 +233,8 @@ mod tests {
     use light_zero_copy::borsh::Deserialize;
     use pinocchio::pubkey::Pubkey;
 
-    use crate::invoke_cpi::processor::clear_cpi_context_account;
-
     use super::*;
+    use crate::invoke_cpi::processor::clear_cpi_context_account;
 
     fn clean_input_data(instruction_data: &mut InstructionDataInvokeCpi) {
         instruction_data.cpi_context = None;