format

Author: sergeytimoshin

sdk-libs/client/src/interface/instructions.rs

@@ -242,7 +242,10 @@ where
     // Process PDAs first, then tokens, to match on-chain split_at(token_accounts_offset).
     for &i in pda_indices.iter().chain(token_indices.iter()) {
         let (acc, data) = &cold_accounts[i];
-        let proof_tree_info = tree_infos.get(i).copied().ok_or("tree info index out of bounds")?;
+        let proof_tree_info = tree_infos
+            .get(i)
+            .copied()
+            .ok_or("tree info index out of bounds")?;
         let queue_index = remaining_accounts.insert_or_get(acc.tree_info.queue);
         let tree_info = PackedStateTreeInfo {
             queue_pubkey_index: queue_index,

sdk-libs/client/src/interface/load_accounts.rs

@@ -432,10 +432,12 @@ fn build_transfer2(
 
     for (i, ctx) in contexts.iter().enumerate() {
         let token = &ctx.compressed.token;
-        let tree = tree_infos.get(i).ok_or(LoadAccountsError::TreeInfoIndexOutOfBounds {
-            index: i,
-            len: tree_infos.len(),
-        })?;
+        let tree = tree_infos
+            .get(i)
+            .ok_or(LoadAccountsError::TreeInfoIndexOutOfBounds {
+                index: i,
+                len: tree_infos.len(),
+            })?;
 
         let owner_idx = packed.insert_or_get_config(ctx.wallet_owner, true, false);
         let ata_idx = packed.insert_or_get(derive_token_ata(&ctx.wallet_owner, &ctx.mint));

sdk-tests/sdk-pinocchio-v2-test/tests/test.rs

@@ -111,7 +111,8 @@ pub async fn create_pda(
         .value;
 
     let output_merkle_tree_index = accounts.insert_or_get(*merkle_tree_pubkey);
-    let packed_address_tree_info = rpc_result.pack_tree_infos(&mut accounts).address_trees[0];
+    let packed_tree_infos = rpc_result.pack_tree_infos(&mut accounts)?;
+    let packed_address_tree_info = packed_tree_infos.address_trees[0];
     let (accounts, system_accounts_offset, tree_accounts_offset) = accounts.to_account_metas();
     let instruction_data = CreatePdaInstructionData {
         proof: rpc_result.proof,
@@ -154,7 +155,7 @@ pub async fn update_pda(
         .value;
 
     let packed_accounts = rpc_result
-        .pack_tree_infos(&mut accounts)
+        .pack_tree_infos(&mut accounts)?
         .state_trees
         .unwrap();
 

sdk-tests/sdk-token-test/tests/test_4_invocations.rs

@@ -47,7 +47,9 @@ fn pack_selected_output_tree_index(
         .next_tree_info
         .map(|next| next.pack_output_tree_index(remaining_accounts))
         .unwrap_or_else(|| tree_info.pack_output_tree_index(remaining_accounts))
-        .map_err(|error| RpcError::CustomError(format!("Failed to pack output tree index: {error}")))
+        .map_err(|error| {
+            RpcError::CustomError(format!("Failed to pack output tree index: {error}"))
+        })
 }
 
 #[ignore = "fix cpi context usage"]
@@ -525,8 +527,10 @@ async fn test_four_invokes_instruction(
         )
         .await?
         .value;
-    let output_tree_index =
-        pack_selected_output_tree_index(mint2_token_account.account.tree_info, &mut remaining_accounts)?;
+    let output_tree_index = pack_selected_output_tree_index(
+        mint2_token_account.account.tree_info,
+        &mut remaining_accounts,
+    )?;
     let packed_tree_infos = pack_input_state_tree_infos(&rpc_result, &mut remaining_accounts);
 
     // Create token metas from compressed accounts - each uses its respective tree info index

sdk-tests/sdk-token-test/tests/test_4_transfer2.rs

@@ -52,7 +52,9 @@ fn pack_selected_output_tree_index(
         .next_tree_info
         .map(|next| next.pack_output_tree_index(remaining_accounts))
         .unwrap_or_else(|| tree_info.pack_output_tree_index(remaining_accounts))
-        .map_err(|error| RpcError::CustomError(format!("Failed to pack output tree index: {error}")))
+        .map_err(|error| {
+            RpcError::CustomError(format!("Failed to pack output tree index: {error}"))
+        })
 }
 
 #[tokio::test]
@@ -465,8 +467,10 @@ async fn test_four_transfer2_instruction(
         )
         .await?
         .value;
-    let output_tree_index =
-        pack_selected_output_tree_index(mint2_token_account.account.tree_info, &mut remaining_accounts)?;
+    let output_tree_index = pack_selected_output_tree_index(
+        mint2_token_account.account.tree_info,
+        &mut remaining_accounts,
+    )?;
     let packed_tree_infos = pack_input_state_tree_infos(&rpc_result, &mut remaining_accounts);
 
     // Create token metas from compressed accounts - each uses its respective tree info index

sdk-tests/sdk-token-test/tests/test_deposit.rs

@@ -51,17 +51,20 @@ fn pack_selected_output_tree_context(
         (
             next.tree,
             next.queue,
-            next.pack_output_tree_index(remaining_accounts).map_err(|error| {
-                RpcError::CustomError(format!("Failed to pack output tree index: {error}"))
-            })?,
+            next.pack_output_tree_index(remaining_accounts)
+                .map_err(|error| {
+                    RpcError::CustomError(format!("Failed to pack output tree index: {error}"))
+                })?,
         )
     } else {
         (
             tree_info.tree,
             tree_info.queue,
-            tree_info.pack_output_tree_index(remaining_accounts).map_err(|error| {
-                RpcError::CustomError(format!("Failed to pack output tree index: {error}"))
-            })?,
+            tree_info
+                .pack_output_tree_index(remaining_accounts)
+                .map_err(|error| {
+                    RpcError::CustomError(format!("Failed to pack output tree index: {error}"))
+                })?,
         )
     };
 
@@ -354,7 +357,10 @@ async fn update_deposit_compressed_account(
         rpc_result.accounts[0].tree_info.queue.to_bytes()
     );
     let (output_tree_index, output_tree_queue_index, output_state_tree_index) =
-        pack_selected_output_tree_context(rpc_result.accounts[0].tree_info, &mut remaining_accounts)?;
+        pack_selected_output_tree_context(
+            rpc_result.accounts[0].tree_info,
+            &mut remaining_accounts,
+        )?;
     println!("output_tree_index {}", output_tree_index);
     println!("output_tree_queue_index {}", output_tree_queue_index);
     println!("output_state_tree_index {}", output_state_tree_index);