diff --git a/account-decoder/src/parse_account_data.rs b/account-decoder/src/parse_account_data.rs index 9f58a0c4fb49b9..6cf54d11c8fd93 100644 --- a/account-decoder/src/parse_account_data.rs +++ b/account-decoder/src/parse_account_data.rs @@ -73,32 +73,11 @@ pub enum ParsableAccount { Vote, } -#[deprecated(since = "2.0.0", note = "Use `AccountAdditionalDataV3` instead")] -#[derive(Clone, Copy, Default)] -pub struct AccountAdditionalData { - pub spl_token_decimals: Option, -} - -#[deprecated(since = "2.2.0", note = "Use `AccountAdditionalDataV3` instead")] -#[derive(Clone, Copy, Default)] -pub struct AccountAdditionalDataV2 { - pub spl_token_additional_data: Option, -} - #[derive(Clone, Copy, Default)] pub struct AccountAdditionalDataV3 { pub spl_token_additional_data: Option, } -#[allow(deprecated)] -impl From for AccountAdditionalDataV3 { - fn from(v: AccountAdditionalDataV2) -> Self { - Self { - spl_token_additional_data: v.spl_token_additional_data.map(Into::into), - } - } -} - #[derive(Clone, Copy, Default)] pub struct SplTokenAdditionalData { pub decimals: u8, @@ -140,37 +119,6 @@ impl SplTokenAdditionalDataV2 { } } -#[deprecated(since = "2.0.0", note = "Use `parse_account_data_v3` instead")] -#[allow(deprecated)] -pub fn parse_account_data( - pubkey: &Pubkey, - program_id: &Pubkey, - data: &[u8], - additional_data: Option, -) -> Result { - parse_account_data_v3( - pubkey, - program_id, - data, - additional_data.map(|d| AccountAdditionalDataV3 { - spl_token_additional_data: d - .spl_token_decimals - .map(SplTokenAdditionalDataV2::with_decimals), - }), - ) -} - -#[deprecated(since = "2.2.0", note = "Use `parse_account_data_v3` instead")] -#[allow(deprecated)] -pub fn parse_account_data_v2( - pubkey: &Pubkey, - program_id: &Pubkey, - data: &[u8], - additional_data: Option, -) -> Result { - parse_account_data_v3(pubkey, program_id, data, additional_data.map(Into::into)) -} - pub fn parse_account_data_v3( pubkey: &Pubkey, program_id: &Pubkey, diff --git a/account-decoder/src/parse_token.rs b/account-decoder/src/parse_token.rs index 88354eec97c793..51954246282c27 100644 --- a/account-decoder/src/parse_token.rs +++ b/account-decoder/src/parse_token.rs @@ -1,8 +1,6 @@ use { crate::{ - parse_account_data::{ - ParsableAccount, ParseAccountError, SplTokenAdditionalData, SplTokenAdditionalDataV2, - }, + parse_account_data::{ParsableAccount, ParseAccountError, SplTokenAdditionalDataV2}, parse_token_extension::parse_extension, }, solana_program_option::COption, @@ -23,25 +21,6 @@ pub use { spl_generic_token::{is_known_spl_token_id, spl_token_ids}, }; -#[deprecated(since = "2.0.0", note = "Use `parse_token_v3` instead")] -#[allow(deprecated)] -pub fn parse_token( - data: &[u8], - decimals: Option, -) -> Result { - let additional_data = decimals.map(SplTokenAdditionalData::with_decimals); - parse_token_v2(data, additional_data.as_ref()) -} - -#[deprecated(since = "2.2.0", note = "Use `parse_token_v3` instead")] -pub fn parse_token_v2( - data: &[u8], - additional_data: Option<&SplTokenAdditionalData>, -) -> Result { - let additional_data = additional_data.map(|v| (*v).into()); - parse_token_v3(data, additional_data.as_ref()) -} - pub fn parse_token_v3( data: &[u8], additional_data: Option<&SplTokenAdditionalDataV2>, @@ -143,20 +122,6 @@ pub fn convert_account_state(state: AccountState) -> UiAccountState { } } -#[deprecated(since = "2.0.0", note = "Use `token_amount_to_ui_amount_v3` instead")] -#[allow(deprecated)] -pub fn token_amount_to_ui_amount(amount: u64, decimals: u8) -> UiTokenAmount { - token_amount_to_ui_amount_v2(amount, &SplTokenAdditionalData::with_decimals(decimals)) -} - -#[deprecated(since = "2.2.0", note = "Use `token_amount_to_ui_amount_v3` instead")] -pub fn token_amount_to_ui_amount_v2( - amount: u64, - additional_data: &SplTokenAdditionalData, -) -> UiTokenAmount { - token_amount_to_ui_amount_v3(amount, &(*additional_data).into()) -} - pub fn token_amount_to_ui_amount_v3( amount: u64, additional_data: &SplTokenAdditionalDataV2,