refactor: use pack_output_tree_index for tree selection

Author: ananas-block

basic-operations/native/programs/burn/src/test_helpers.rs

@@ -11,7 +11,6 @@ use solana_sdk::{
 pub async fn create_compressed_account(
     payer: &Keypair,
     rpc: &mut LightProgramTest,
-    merkle_tree_pubkey: &Pubkey,
     address_tree_pubkey: Pubkey,
     address: [u8; 32],
     message: String,
@@ -33,14 +32,16 @@ pub async fn create_compressed_account(
         .await?
         .value;
 
-    let output_state_tree_index = accounts.insert_or_get(*merkle_tree_pubkey);
+    let output_state_tree_index = rpc
+        .get_random_state_tree_info()?
+        .pack_output_tree_index(&mut accounts)?;
     let packed_address_tree_info = rpc_result.pack_tree_infos(&mut accounts).address_trees[0];
     let (account_metas, _, _) = accounts.to_account_metas();
 
     let instruction_data = CreateInstructionData {
         proof: rpc_result.proof,
         address_tree_info: packed_address_tree_info,
-        output_state_tree_index: output_state_tree_index,
+        output_state_tree_index,
         message,
     };
     let inputs = instruction_data.try_to_vec().unwrap();

basic-operations/native/programs/burn/tests/test.rs

@@ -30,12 +30,9 @@ async fn test_burn() {
         &address_tree_pubkey,
         &ID,
     );
-    let merkle_tree_pubkey = rpc.get_random_state_tree_info().unwrap().tree;
-
     native_program_burn::test_helpers::create_compressed_account(
         &payer,
         &mut rpc,
-        &merkle_tree_pubkey,
         address_tree_pubkey,
         address,
         "Hello, compressed world!".to_string(),

basic-operations/native/programs/close/src/test_helpers.rs

@@ -11,7 +11,6 @@ use solana_sdk::{
 pub async fn create_compressed_account(
     payer: &Keypair,
     rpc: &mut LightProgramTest,
-    merkle_tree_pubkey: &Pubkey,
     address_tree_pubkey: Pubkey,
     address: [u8; 32],
     message: String,
@@ -33,14 +32,16 @@ pub async fn create_compressed_account(
         .await?
         .value;
 
-    let output_state_tree_index = accounts.insert_or_get(*merkle_tree_pubkey);
+    let output_state_tree_index = rpc
+        .get_random_state_tree_info()?
+        .pack_output_tree_index(&mut accounts)?;
     let packed_address_tree_info = rpc_result.pack_tree_infos(&mut accounts).address_trees[0];
     let (account_metas, _, _) = accounts.to_account_metas();
 
     let instruction_data = CreateInstructionData {
         proof: rpc_result.proof,
         address_tree_info: packed_address_tree_info,
-        output_state_tree_index: output_state_tree_index,
+        output_state_tree_index,
         message,
     };
     let inputs = instruction_data.try_to_vec().unwrap();

basic-operations/native/programs/close/tests/test.rs

@@ -28,12 +28,9 @@ async fn test_close() {
         &address_tree_pubkey,
         &ID,
     );
-    let merkle_tree_pubkey = rpc.get_random_state_tree_info().unwrap().tree;
-
     native_program_close::test_helpers::create_compressed_account(
         &payer,
         &mut rpc,
-        &merkle_tree_pubkey,
         address_tree_pubkey,
         address,
         "Hello, compressed world!".to_string(),

basic-operations/native/programs/reinit/src/test_helpers.rs

@@ -12,7 +12,6 @@ use solana_sdk::{
 pub async fn create_compressed_account(
     payer: &Keypair,
     rpc: &mut LightProgramTest,
-    merkle_tree_pubkey: &Pubkey,
     address_tree_pubkey: Pubkey,
     address: [u8; 32],
     message: String,
@@ -34,14 +33,16 @@ pub async fn create_compressed_account(
         .await?
         .value;
 
-    let output_state_tree_index = accounts.insert_or_get(*merkle_tree_pubkey);
+    let output_state_tree_index = rpc
+        .get_random_state_tree_info()?
+        .pack_output_tree_index(&mut accounts)?;
     let packed_address_tree_info = rpc_result.pack_tree_infos(&mut accounts).address_trees[0];
     let (account_metas, _, _) = accounts.to_account_metas();
 
     let instruction_data = CreateInstructionData {
         proof: rpc_result.proof,
         address_tree_info: packed_address_tree_info,
-        output_state_tree_index: output_state_tree_index,
+        output_state_tree_index,
         message,
     };
     let inputs = instruction_data.try_to_vec().unwrap();

basic-operations/native/programs/reinit/tests/test.rs

@@ -31,12 +31,9 @@ async fn test_reinit() {
         &address_tree_pubkey,
         &ID,
     );
-    let merkle_tree_pubkey = rpc.get_random_state_tree_info().unwrap().tree;
-
     native_program_reinit::test_helpers::create_compressed_account(
         &payer,
         &mut rpc,
-        &merkle_tree_pubkey,
         address_tree_pubkey,
         address,
         "Hello, compressed world!".to_string(),

basic-operations/native/programs/update/src/test_helpers.rs

@@ -11,7 +11,6 @@ use solana_sdk::{
 pub async fn create_compressed_account(
     payer: &Keypair,
     rpc: &mut LightProgramTest,
-    merkle_tree_pubkey: &Pubkey,
     address_tree_pubkey: Pubkey,
     address: [u8; 32],
     message: String,
@@ -33,7 +32,9 @@ pub async fn create_compressed_account(
         .await?
         .value;
 
-    let output_state_tree_index = accounts.insert_or_get(*merkle_tree_pubkey);
+    let output_state_tree_index = rpc
+        .get_random_state_tree_info()?
+        .pack_output_tree_index(&mut accounts)?;
     let packed_address_tree_info = rpc_result.pack_tree_infos(&mut accounts).address_trees[0];
     let (account_metas, _, _) = accounts.to_account_metas();
 

basic-operations/native/programs/update/tests/test.rs

@@ -32,12 +32,9 @@ async fn test_update() {
         &address_tree_pubkey,
         &ID,
     );
-    let merkle_tree_pubkey = rpc.get_random_state_tree_info().unwrap().tree;
-
     native_program_update::test_helpers::create_compressed_account(
         &payer,
         &mut rpc,
-        &merkle_tree_pubkey,
         address_tree_pubkey,
         address,
         "Hello, compressed world!".to_string(),

counter/native/tests/test.rs

@@ -34,12 +34,9 @@ async fn test_counter() {
         &address_tree_pubkey,
         &counter::ID,
     );
-    let merkle_tree_pubkey = rpc.get_random_state_tree_info().unwrap().tree;
-
     create_counter(
         &payer,
         &mut rpc,
-        &merkle_tree_pubkey,
         address_tree_pubkey,
         address,
     )
@@ -109,7 +106,6 @@ async fn test_counter() {
 pub async fn create_counter(
     payer: &Keypair,
     rpc: &mut LightProgramTest,
-    merkle_tree_pubkey: &Pubkey,
     address_tree_pubkey: Pubkey,
     address: [u8; 32],
 ) -> Result<(), RpcError> {
@@ -130,14 +126,16 @@ pub async fn create_counter(
         .await?
         .value;
 
-    let output_merkle_tree_index = accounts.insert_or_get(*merkle_tree_pubkey);
+    let output_state_tree_index = rpc
+        .get_random_state_tree_info()?
+        .pack_output_tree_index(&mut accounts)?;
     let packed_address_tree_info = rpc_result.pack_tree_infos(&mut accounts).address_trees[0];
     let (account_metas, _, _) = accounts.to_account_metas();
 
     let instruction_data = CreateCounterInstructionData {
         proof: rpc_result.proof,
         address_tree_info: packed_address_tree_info,
-        output_state_tree_index: output_merkle_tree_index,
+        output_state_tree_index,
     };
     let inputs = instruction_data.try_to_vec().unwrap();
 

counter/pinocchio/tests/test.rs

@@ -34,12 +34,9 @@ async fn test_counter() {
         &address_tree_pubkey,
         &counter::ID.into(),
     );
-    let merkle_tree_pubkey = rpc.get_random_state_tree_info().unwrap().tree;
-
     create_counter(
         &payer,
         &mut rpc,
-        &merkle_tree_pubkey,
         address_tree_pubkey,
         address,
     )
@@ -100,7 +97,6 @@ async fn test_counter() {
 pub async fn create_counter(
     payer: &Keypair,
     rpc: &mut LightProgramTest,
-    merkle_tree_pubkey: &Pubkey,
     address_tree_pubkey: Pubkey,
     address: [u8; 32],
 ) -> Result<(), RpcError> {
@@ -121,14 +117,16 @@ pub async fn create_counter(
         .await?
         .value;
 
-    let output_merkle_tree_index = accounts.insert_or_get(*merkle_tree_pubkey);
+    let output_state_tree_index = rpc
+        .get_random_state_tree_info()?
+        .pack_output_tree_index(&mut accounts)?;
     let packed_address_tree_info = rpc_result.pack_tree_infos(&mut accounts).address_trees[0];
     let (accounts, _, _) = accounts.to_account_metas();
 
     let instruction_data = CreateCounterInstructionData {
         proof: rpc_result.proof,
         address_tree_info: packed_address_tree_info,
-        output_state_tree_index: output_merkle_tree_index,
+        output_state_tree_index,
     };
     let inputs = instruction_data.try_to_vec().unwrap();