token-2022: Refactor StateWithExtensionsMut functionality into trait (

#6329) * Refactor `StateWithExtensionsMut` functionality into trait * Dedupe unpack function * Simplify passing function
solana-labs · Mar 5, 2024 · a42d7bd · a42d7bd
1 parent 0b93ebd
commit a42d7bd
Show file tree

Hide file tree

Showing 17 changed files with 175 additions and 134 deletions.
diff --git a/token/program-2022/src/extension/confidential_transfer/processor.rs b/token/program-2022/src/extension/confidential_transfer/processor.rs
@@ -18,7 +18,8 @@ use {
             },
             memo_transfer::{check_previous_sibling_instruction_is_memo, memo_required},
             transfer_fee::TransferFeeConfig,
-            BaseStateWithExtensions, StateWithExtensions, StateWithExtensionsMut,
+            BaseStateWithExtensions, BaseStateWithExtensionsMut, StateWithExtensions,
+            StateWithExtensionsMut,
         },
         instruction::{decode_instruction_data, decode_instruction_type},
         processor::Processor,

diff --git a/token/program-2022/src/extension/confidential_transfer_fee/processor.rs b/token/program-2022/src/extension/confidential_transfer_fee/processor.rs
@@ -24,7 +24,7 @@ use {
                 EncryptedWithheldAmount,
             },
             transfer_fee::TransferFeeConfig,
-            BaseStateWithExtensions, StateWithExtensionsMut,
+            BaseStateWithExtensions, BaseStateWithExtensionsMut, StateWithExtensionsMut,
         },
         instruction::{decode_instruction_data, decode_instruction_type},
         processor::Processor,

diff --git a/token/program-2022/src/extension/cpi_guard/processor.rs b/token/program-2022/src/extension/cpi_guard/processor.rs
@@ -4,7 +4,7 @@ use {
         error::TokenError,
         extension::{
             cpi_guard::{in_cpi, instruction::CpiGuardInstruction, CpiGuard},
-            StateWithExtensionsMut,
+            BaseStateWithExtensionsMut, StateWithExtensionsMut,
         },
         instruction::decode_instruction_type,
         processor::Processor,

diff --git a/token/program-2022/src/extension/default_account_state/processor.rs b/token/program-2022/src/extension/default_account_state/processor.rs
@@ -7,7 +7,7 @@ use {
                 instruction::{decode_instruction, DefaultAccountStateInstruction},
                 DefaultAccountState,
             },
-            StateWithExtensionsMut,
+            BaseStateWithExtensionsMut, StateWithExtensionsMut,
         },
         processor::Processor,
         state::{AccountState, Mint},

diff --git a/token/program-2022/src/extension/group_member_pointer/processor.rs b/token/program-2022/src/extension/group_member_pointer/processor.rs
@@ -9,7 +9,7 @@ use {
                 },
                 GroupMemberPointer,
             },
-            StateWithExtensionsMut,
+            BaseStateWithExtensionsMut, StateWithExtensionsMut,
         },
         instruction::{decode_instruction_data, decode_instruction_type},
         processor::Processor,

diff --git a/token/program-2022/src/extension/group_pointer/processor.rs b/token/program-2022/src/extension/group_pointer/processor.rs
@@ -9,7 +9,7 @@ use {
                 },
                 GroupPointer,
             },
-            StateWithExtensionsMut,
+            BaseStateWithExtensionsMut, StateWithExtensionsMut,
         },
         instruction::{decode_instruction_data, decode_instruction_type},
         processor::Processor,

diff --git a/token/program-2022/src/extension/interest_bearing_mint/processor.rs b/token/program-2022/src/extension/interest_bearing_mint/processor.rs
@@ -7,7 +7,7 @@ use {
                 instruction::{InitializeInstructionData, InterestBearingMintInstruction},
                 BasisPoints, InterestBearingConfig,
             },
-            StateWithExtensionsMut,
+            BaseStateWithExtensionsMut, StateWithExtensionsMut,
         },
         instruction::{decode_instruction_data, decode_instruction_type},
         processor::Processor,

diff --git a/token/program-2022/src/extension/memo_transfer/processor.rs b/token/program-2022/src/extension/memo_transfer/processor.rs
@@ -3,7 +3,7 @@ use {
         check_program_account,
         extension::{
             memo_transfer::{instruction::RequiredMemoTransfersInstruction, MemoTransfer},
-            StateWithExtensionsMut,
+            BaseStateWithExtensionsMut, StateWithExtensionsMut,
         },
         instruction::decode_instruction_type,
         processor::Processor,

diff --git a/token/program-2022/src/extension/metadata_pointer/processor.rs b/token/program-2022/src/extension/metadata_pointer/processor.rs
@@ -9,7 +9,7 @@ use {
                 },
                 MetadataPointer,
             },
-            StateWithExtensionsMut,
+            BaseStateWithExtensionsMut, StateWithExtensionsMut,
         },
         instruction::{decode_instruction_data, decode_instruction_type},
         processor::Processor,