fix: correct spelling and improve comments in account compression module (#1553)

* fix: correct spelling and improve comments in account compression module

* chore: remove commented-out code in sdk (#1551)

* fix: correct spelling in comments for batched merkle tree test

Author: sergeytimoshin

forester/src/tree_data_sync.rs

@@ -1,5 +1,5 @@
 use account_compression::{
-    utils::check_discrimininator::check_discriminator, AddressMerkleTreeAccount,
+    utils::check_discriminator::check_discriminator, AddressMerkleTreeAccount,
     StateMerkleTreeAccount,
 };
 use borsh::BorshDeserialize;

program-tests/account-compression-test/tests/batched_merkle_tree_test.rs

@@ -1183,7 +1183,7 @@ async fn test_rollover_batch_state_merkle_trees() {
         )
         .unwrap();
     }
-    // Sent funds to nullier queue for rollover reimbursment
+    // Sent funds to nullifier queue for rollover reimbursement
     // rollover fees are now transferred in the system program.
     airdrop_lamports(
         &mut context,
@@ -1485,7 +1485,7 @@ pub async fn perform_init_batch_address_merkle_tree(
         Some(merkle_tree_keypair),
     );
 
-    let instruction = account_compression::instruction::IntializeBatchedAddressMerkleTree {
+    let instruction = account_compression::instruction::InitializeBatchedAddressMerkleTree {
         bytes: params.try_to_vec().unwrap(),
     };
     let accounts = account_compression::accounts::InitializeBatchedAddressMerkleTree {

programs/account-compression/src/instructions/intialize_batched_state_merkle_tree.rs

@@ -56,7 +56,7 @@ pub fn process_initialize_batched_state_merkle_tree<'info>(
     };
     let merkle_tree_account_info = ctx.accounts.merkle_tree.to_account_info();
     let queue_account_info = ctx.accounts.queue.to_account_info();
-    let additional_bytes_rent = (Rent::get()?).minimum_balance(params.additional_bytes as usize);
+    let additional_bytes_rent = Rent::get()?.minimum_balance(params.additional_bytes as usize);
     init_batched_state_merkle_tree_from_account_info(
         params,
         owner,

programs/account-compression/src/instructions/rollover_address_merkle_tree_and_queue.rs

@@ -20,7 +20,7 @@ use crate::{
 #[derive(Accounts)]
 pub struct RolloverAddressMerkleTreeAndQueue<'info> {
     #[account(mut)]
-    /// Signer used to receive rollover accounts rentexemption reimbursement.
+    /// Signer used to receive rollover accounts rent exemption reimbursement.
     pub fee_payer: Signer<'info>,
     pub authority: Signer<'info>,
     pub registered_program_pda: Option<Account<'info, RegisteredProgram>>,

programs/account-compression/src/instructions/rollover_batched_address_merkle_tree.rs

@@ -1,4 +1,4 @@
-use anchor_lang::{prelude::*, solana_program::pubkey::Pubkey};
+use anchor_lang::prelude::*;
 use light_batched_merkle_tree::{
     merkle_tree::BatchedMerkleTreeAccount,
     rollover_address_tree::rollover_batched_address_tree_from_account_info,
@@ -17,7 +17,7 @@ use crate::{
 #[derive(Accounts)]
 pub struct RolloverBatchedAddressMerkleTree<'info> {
     #[account(mut)]
-    /// Signer used to receive rollover accounts rentexemption reimbursement.
+    /// Signer used to receive rollover accounts rent exemption reimbursement.
     pub fee_payer: Signer<'info>,
     pub authority: Signer<'info>,
     pub registered_program_pda: Option<Account<'info, RegisteredProgram>>,

programs/account-compression/src/instructions/rollover_batched_state_merkle_tree.rs

@@ -1,4 +1,4 @@
-use anchor_lang::{prelude::*, solana_program::pubkey::Pubkey};
+use anchor_lang::prelude::*;
 use light_batched_merkle_tree::{
     merkle_tree::BatchedMerkleTreeAccount,
     rollover_state_tree::rollover_batched_state_tree_from_account_info,
@@ -18,7 +18,7 @@ use crate::{
 #[derive(Accounts)]
 pub struct RolloverBatchedStateMerkleTree<'info> {
     #[account(mut)]
-    /// Signer used to receive rollover accounts rentexemption reimbursement.
+    /// Signer used to receive rollover accounts rent exemption reimbursement.
     pub fee_payer: Signer<'info>,
     pub authority: Signer<'info>,
     pub registered_program_pda: Option<Account<'info, RegisteredProgram>>,

programs/account-compression/src/instructions/rollover_state_merkle_tree_and_queue.rs

@@ -24,7 +24,7 @@ use crate::{
 #[derive(Accounts)]
 pub struct RolloverStateMerkleTreeAndNullifierQueue<'info> {
     #[account(mut)]
-    /// Signer used to receive rollover accounts rentexemption reimbursement.
+    /// Signer used to receive rollover accounts rent exemption reimbursement.
     pub fee_payer: Signer<'info>,
     pub authority: Signer<'info>,
     pub registered_program_pda: Option<Account<'info, RegisteredProgram>>,

programs/account-compression/src/lib.rs

@@ -212,7 +212,7 @@ pub mod account_compression {
     /// 2. update address tree
     ///     The address tree is updated with the instruction
     ///     batch_update_address_tree.
-    pub fn intialize_batched_address_merkle_tree<'info>(
+    pub fn initialize_batched_address_merkle_tree<'info>(
         ctx: Context<'_, '_, '_, 'info, InitializeBatchedAddressMerkleTree<'info>>,
         bytes: Vec<u8>,
     ) -> Result<()> {

programs/account-compression/src/processor/insert_nullifiers.rs

@@ -42,8 +42,7 @@ pub fn insert_nullifiers(
     for &(tree_index, queue_index) in &visited {
         // Lookup the queue and tree accounts
         let (queue_account, merkle_tree_account) =
-            get_queue_and_tree_accounts(accounts, queue_index as usize, tree_index as usize)
-                .unwrap();
+            get_queue_and_tree_accounts(accounts, queue_index as usize, tree_index as usize)?;
 
         // Dispatch to v1 / v2 / ... based on the account type
         match queue_account {

programs/account-compression/src/utils/check_account.rs

@@ -21,10 +21,10 @@ pub fn check_account_balance_is_rent_exempt(
         return err!(AccountCompressionErrorCode::InvalidAccountSize);
     }
     let lamports = account_info.lamports();
-    let rent_exemption = (Rent::get()?).minimum_balance(expected_size);
+    let rent_exemption = Rent::get()?.minimum_balance(expected_size);
     if lamports != rent_exemption {
         msg!(
-            "Account {:?} lamports is not equal to rentexemption: lamports {}, rent exemption {}",
+            "Account {:?} lamports is not equal to rent exemption: lamports {}, rent exemption {}",
             account_info.key(),
             lamports,
             rent_exemption