From 84ae880eba1921ec0af8d49a3cf5f46c633fb662 Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 20 Sep 2023 23:30:32 +0200 Subject: [PATCH] Update everything to use non-deprecated functions --- feature-proposal/program/src/instruction.rs | 2 +- feature-proposal/program/src/state.rs | 2 +- governance/program/src/processor/mod.rs | 2 +- governance/program/src/state/realm.rs | 2 +- governance/program/src/state/token_owner_record.rs | 2 +- governance/test-sdk/src/lib.rs | 2 +- governance/tools/src/account.rs | 2 +- libraries/type-length-value-derive-test/src/lib.rs | 2 +- libraries/type-length-value/derive/src/builder.rs | 4 ++-- record/program/tests/functional.rs | 2 +- single-pool/cli/src/main.rs | 2 +- single-pool/program/src/instruction.rs | 1 + single-pool/program/src/processor.rs | 2 +- single-pool/program/src/state.rs | 4 ++-- single-pool/program/tests/helpers/token.rs | 2 +- stake-pool/cli/src/client.rs | 4 +++- stake-pool/cli/src/main.rs | 2 +- stake-pool/program/src/instruction.rs | 4 ++++ stake-pool/program/src/processor.rs | 2 +- stake-pool/program/src/state.rs | 4 ++-- stake-pool/program/tests/deposit.rs | 2 +- stake-pool/program/tests/deposit_authority.rs | 2 +- stake-pool/program/tests/deposit_edge_cases.rs | 2 +- stake-pool/program/tests/deposit_sol.rs | 2 +- stake-pool/program/tests/helpers/mod.rs | 4 ++-- stake-pool/program/tests/huge_pool.rs | 2 +- stake-pool/program/tests/initialize.rs | 2 +- stake-pool/program/tests/set_deposit_fee.rs | 2 +- stake-pool/program/tests/set_epoch_fee.rs | 2 +- stake-pool/program/tests/set_funding_authority.rs | 2 +- stake-pool/program/tests/set_manager.rs | 2 +- stake-pool/program/tests/set_preferred.rs | 2 +- stake-pool/program/tests/set_referral_fee.rs | 2 +- stake-pool/program/tests/set_staker.rs | 2 +- stake-pool/program/tests/set_withdrawal_fee.rs | 2 +- stake-pool/program/tests/update_stake_pool_balance.rs | 2 +- stake-pool/program/tests/update_validator_list_balance.rs | 2 +- .../program/tests/update_validator_list_balance_hijack.rs | 2 +- stake-pool/program/tests/vsa_add.rs | 5 ++++- stake-pool/program/tests/vsa_remove.rs | 2 +- stake-pool/program/tests/withdraw.rs | 2 +- stake-pool/program/tests/withdraw_edge_cases.rs | 2 +- stake-pool/program/tests/withdraw_sol.rs | 2 +- stake-pool/program/tests/withdraw_with_fee.rs | 2 +- stateless-asks/program/src/processor.rs | 2 +- token-metadata/example/src/processor.rs | 2 +- token-metadata/example/tests/emit.rs | 2 +- token-metadata/interface/src/state.rs | 2 +- token/client/src/output.rs | 2 +- token/program-2022-test/tests/token_metadata_emit.rs | 2 +- 50 files changed, 62 insertions(+), 52 deletions(-) diff --git a/feature-proposal/program/src/instruction.rs b/feature-proposal/program/src/instruction.rs index bb3c6e61f16..b73c0c8c575 100644 --- a/feature-proposal/program/src/instruction.rs +++ b/feature-proposal/program/src/instruction.rs @@ -160,7 +160,7 @@ mod tests { fn test_get_packed_len() { assert_eq!( FeatureProposalInstruction::get_packed_len(), - solana_program::borsh::get_packed_len::() + solana_program::borsh0_10::get_packed_len::() ) } diff --git a/feature-proposal/program/src/state.rs b/feature-proposal/program/src/state.rs index f1c1cd259ee..559d0b12488 100644 --- a/feature-proposal/program/src/state.rs +++ b/feature-proposal/program/src/state.rs @@ -64,7 +64,7 @@ mod tests { fn test_get_packed_len() { assert_eq!( FeatureProposal::get_packed_len(), - solana_program::borsh::get_packed_len::() + solana_program::borsh0_10::get_packed_len::() ); } diff --git a/governance/program/src/processor/mod.rs b/governance/program/src/processor/mod.rs index f7b0a88a10d..9b8a84b2588 100644 --- a/governance/program/src/processor/mod.rs +++ b/governance/program/src/processor/mod.rs @@ -65,7 +65,7 @@ use process_update_program_metadata::*; use process_withdraw_governing_tokens::*; use solana_program::{ - account_info::AccountInfo, borsh::try_from_slice_unchecked, entrypoint::ProgramResult, msg, + account_info::AccountInfo, borsh0_10::try_from_slice_unchecked, entrypoint::ProgramResult, msg, program_error::ProgramError, pubkey::Pubkey, }; diff --git a/governance/program/src/state/realm.rs b/governance/program/src/state/realm.rs index e2e4aa557ea..3027b770234 100644 --- a/governance/program/src/state/realm.rs +++ b/governance/program/src/state/realm.rs @@ -458,7 +458,7 @@ pub fn assert_valid_realm_config_args( mod test { use crate::instruction::GovernanceInstruction; - use solana_program::borsh::try_from_slice_unchecked; + use solana_program::borsh0_10::try_from_slice_unchecked; use super::*; diff --git a/governance/program/src/state/token_owner_record.rs b/governance/program/src/state/token_owner_record.rs index 700eb31ee24..846dcd9b0bf 100644 --- a/governance/program/src/state/token_owner_record.rs +++ b/governance/program/src/state/token_owner_record.rs @@ -422,7 +422,7 @@ pub fn get_token_owner_record_data_for_proposal_owner( #[cfg(test)] mod test { - use solana_program::{borsh::get_packed_len, stake_history::Epoch}; + use solana_program::{borsh0_10::get_packed_len, stake_history::Epoch}; use super::*; diff --git a/governance/test-sdk/src/lib.rs b/governance/test-sdk/src/lib.rs index 3cf7a72b554..6d615400c6b 100644 --- a/governance/test-sdk/src/lib.rs +++ b/governance/test-sdk/src/lib.rs @@ -4,7 +4,7 @@ use std::borrow::Borrow; use borsh::{BorshDeserialize, BorshSerialize}; use cookies::{TokenAccountCookie, WalletCookie}; use solana_program::{ - borsh::try_from_slice_unchecked, clock::Clock, instruction::Instruction, + borsh0_10::try_from_slice_unchecked, clock::Clock, instruction::Instruction, program_error::ProgramError, program_pack::Pack, pubkey::Pubkey, rent::Rent, stake_history::Epoch, system_instruction, system_program, sysvar, }; diff --git a/governance/tools/src/account.rs b/governance/tools/src/account.rs index c2b504fa324..a5e267b241b 100644 --- a/governance/tools/src/account.rs +++ b/governance/tools/src/account.rs @@ -3,7 +3,7 @@ use borsh::{BorshDeserialize, BorshSerialize}; use solana_program::{ account_info::AccountInfo, - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, msg, program::invoke, program::invoke_signed, diff --git a/libraries/type-length-value-derive-test/src/lib.rs b/libraries/type-length-value-derive-test/src/lib.rs index a7f2481cb4a..032d1341a4f 100644 --- a/libraries/type-length-value-derive-test/src/lib.rs +++ b/libraries/type-length-value-derive-test/src/lib.rs @@ -7,7 +7,7 @@ pub mod test { use { borsh::{BorshDeserialize, BorshSerialize}, - solana_program::borsh::{get_instance_packed_len, try_from_slice_unchecked}, + solana_program::borsh0_10::{get_instance_packed_len, try_from_slice_unchecked}, spl_discriminator::SplDiscriminate, spl_type_length_value::{variable_len_pack::VariableLenPack, SplBorshVariableLenPack}, }; diff --git a/libraries/type-length-value/derive/src/builder.rs b/libraries/type-length-value/derive/src/builder.rs index c50d34aa6e7..59254d41ee7 100644 --- a/libraries/type-length-value/derive/src/builder.rs +++ b/libraries/type-length-value/derive/src/builder.rs @@ -79,11 +79,11 @@ impl From<&SplBorshVariableLenPackBuilder> for TokenStream { } fn unpack_from_slice(src: &[u8]) -> Result { - solana_program::borsh::try_from_slice_unchecked(src).map_err(Into::into) + solana_program::borsh0_10::try_from_slice_unchecked(src).map_err(Into::into) } fn get_packed_len(&self) -> Result { - solana_program::borsh::get_instance_packed_len(self).map_err(Into::into) + solana_program::borsh0_10::get_instance_packed_len(self).map_err(Into::into) } } } diff --git a/record/program/tests/functional.rs b/record/program/tests/functional.rs index d194eabfce8..3582d13cbf8 100644 --- a/record/program/tests/functional.rs +++ b/record/program/tests/functional.rs @@ -3,7 +3,7 @@ use { borsh::BorshSerialize, solana_program::{ - borsh::get_packed_len, + borsh0_10::get_packed_len, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, rent::Rent, diff --git a/single-pool/cli/src/main.rs b/single-pool/cli/src/main.rs index 72dbfefea66..6f23c333e93 100644 --- a/single-pool/cli/src/main.rs +++ b/single-pool/cli/src/main.rs @@ -8,7 +8,7 @@ use { rpc_filter::{Memcmp, RpcFilterType}, }, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, pubkey::Pubkey, signature::Signature, signature::{Keypair, Signer}, diff --git a/single-pool/program/src/instruction.rs b/single-pool/program/src/instruction.rs index 9f522e92b19..b25fe5c974b 100644 --- a/single-pool/program/src/instruction.rs +++ b/single-pool/program/src/instruction.rs @@ -163,6 +163,7 @@ pub fn initialize_pool(program_id: &Pubkey, vote_account_address: &Pubkey) -> In AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(spl_token::id(), false), diff --git a/single-pool/program/src/processor.rs b/single-pool/program/src/processor.rs index 6cf350dd939..be48dc6909e 100644 --- a/single-pool/program/src/processor.rs +++ b/single-pool/program/src/processor.rs @@ -19,7 +19,7 @@ use { borsh::BorshDeserialize, solana_program::{ account_info::{next_account_info, AccountInfo}, - borsh::{get_packed_len, try_from_slice_unchecked}, + borsh0_10::{get_packed_len, try_from_slice_unchecked}, entrypoint::ProgramResult, msg, native_token::LAMPORTS_PER_SOL, diff --git a/single-pool/program/src/state.rs b/single-pool/program/src/state.rs index 285ed75fc86..0174263fe63 100644 --- a/single-pool/program/src/state.rs +++ b/single-pool/program/src/state.rs @@ -4,8 +4,8 @@ use { crate::{error::SinglePoolError, find_pool_address}, borsh::{BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ - account_info::AccountInfo, borsh::try_from_slice_unchecked, program_error::ProgramError, - pubkey::Pubkey, + account_info::AccountInfo, borsh0_10::try_from_slice_unchecked, + program_error::ProgramError, pubkey::Pubkey, }, }; diff --git a/single-pool/program/tests/helpers/token.rs b/single-pool/program/tests/helpers/token.rs index d3db254ccd0..1fe2ccd2b80 100644 --- a/single-pool/program/tests/helpers/token.rs +++ b/single-pool/program/tests/helpers/token.rs @@ -4,7 +4,7 @@ use { borsh::BorshDeserialize, solana_program_test::BanksClient, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, hash::Hash, program_pack::Pack, pubkey::Pubkey, diff --git a/stake-pool/cli/src/client.rs b/stake-pool/cli/src/client.rs index 039d057cef8..444e4608274 100644 --- a/stake-pool/cli/src/client.rs +++ b/stake-pool/cli/src/client.rs @@ -7,7 +7,9 @@ use { rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig}, rpc_filter::{Memcmp, RpcFilterType}, }, - solana_program::{borsh::try_from_slice_unchecked, program_pack::Pack, pubkey::Pubkey, stake}, + solana_program::{ + borsh0_10::try_from_slice_unchecked, program_pack::Pack, pubkey::Pubkey, stake, + }, spl_stake_pool::{ find_withdraw_authority_program_address, state::{StakePool, ValidatorList}, diff --git a/stake-pool/cli/src/main.rs b/stake-pool/cli/src/main.rs index 2ca68ebadad..37c8cb50e7b 100644 --- a/stake-pool/cli/src/main.rs +++ b/stake-pool/cli/src/main.rs @@ -23,7 +23,7 @@ use { solana_cli_output::OutputFormat, solana_client::rpc_client::RpcClient, solana_program::{ - borsh::{get_instance_packed_len, get_packed_len}, + borsh0_10::{get_instance_packed_len, get_packed_len}, instruction::Instruction, program_pack::Pack, pubkey::Pubkey, diff --git a/stake-pool/program/src/instruction.rs b/stake-pool/program/src/instruction.rs index 6e9c57880b2..46d11255f78 100644 --- a/stake-pool/program/src/instruction.rs +++ b/stake-pool/program/src/instruction.rs @@ -709,6 +709,7 @@ pub fn add_validator_to_pool( AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), @@ -859,6 +860,7 @@ pub fn increase_validator_stake( AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), @@ -904,6 +906,7 @@ pub fn increase_additional_validator_stake( AccountMeta::new_readonly(*validator, false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), @@ -954,6 +957,7 @@ pub fn redelegate( AccountMeta::new_readonly(*validator, false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), diff --git a/stake-pool/program/src/processor.rs b/stake-pool/program/src/processor.rs index 938fcf1799a..17ed181a77a 100644 --- a/stake-pool/program/src/processor.rs +++ b/stake-pool/program/src/processor.rs @@ -24,7 +24,7 @@ use { num_traits::FromPrimitive, solana_program::{ account_info::{next_account_info, AccountInfo}, - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, clock::{Clock, Epoch}, decode_error::DecodeError, entrypoint::ProgramResult, diff --git a/stake-pool/program/src/state.rs b/stake-pool/program/src/state.rs index 5088322834a..7d12add010a 100644 --- a/stake-pool/program/src/state.rs +++ b/stake-pool/program/src/state.rs @@ -11,7 +11,7 @@ use { num_traits::{FromPrimitive, ToPrimitive}, solana_program::{ account_info::AccountInfo, - borsh::get_instance_packed_len, + borsh0_10::get_instance_packed_len, msg, program_error::ProgramError, program_memory::sol_memcmp, @@ -1035,7 +1035,7 @@ mod test { super::*, proptest::prelude::*, solana_program::{ - borsh::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, + borsh0_10::{get_packed_len, try_from_slice_unchecked}, clock::{DEFAULT_SLOTS_PER_EPOCH, DEFAULT_S_PER_SLOT, SECONDS_PER_DAY}, native_token::LAMPORTS_PER_SOL, }, diff --git a/stake-pool/program/tests/deposit.rs b/stake-pool/program/tests/deposit.rs index 61c0222d7b2..2bd29b40f42 100644 --- a/stake-pool/program/tests/deposit.rs +++ b/stake-pool/program/tests/deposit.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, stake, sysvar, diff --git a/stake-pool/program/tests/deposit_authority.rs b/stake-pool/program/tests/deposit_authority.rs index c0e4aaee137..55665572cf0 100644 --- a/stake-pool/program/tests/deposit_authority.rs +++ b/stake-pool/program/tests/deposit_authority.rs @@ -8,7 +8,7 @@ use { solana_program::{instruction::InstructionError, stake}, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, signature::{Keypair, Signer}, transaction::TransactionError, }, diff --git a/stake-pool/program/tests/deposit_edge_cases.rs b/stake-pool/program/tests/deposit_edge_cases.rs index df9bd30df35..bd549805645 100644 --- a/stake-pool/program/tests/deposit_edge_cases.rs +++ b/stake-pool/program/tests/deposit_edge_cases.rs @@ -6,7 +6,7 @@ mod helpers; use { helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, }, solana_program_test::*, solana_sdk::{ diff --git a/stake-pool/program/tests/deposit_sol.rs b/stake-pool/program/tests/deposit_sol.rs index 90dd6c96369..7fefde709bd 100644 --- a/stake-pool/program/tests/deposit_sol.rs +++ b/stake-pool/program/tests/deposit_sol.rs @@ -6,7 +6,7 @@ mod helpers; use { helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, }, solana_program_test::*, solana_sdk::{ diff --git a/stake-pool/program/tests/helpers/mod.rs b/stake-pool/program/tests/helpers/mod.rs index 4dccee90f07..a07eec4030e 100644 --- a/stake-pool/program/tests/helpers/mod.rs +++ b/stake-pool/program/tests/helpers/mod.rs @@ -3,7 +3,7 @@ use { borsh::{BorshDeserialize, BorshSerialize}, solana_program::{ - borsh::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, + borsh0_10::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, hash::Hash, instruction::Instruction, program_option::COption, @@ -2377,7 +2377,7 @@ pub fn add_validator_stake_account( stake: stake_amount, activation_epoch: FIRST_NORMAL_EPOCH, deactivation_epoch: u64::MAX, - warmup_cooldown_rate: 0.25, // default + ..Default::default() }, credits_observed: 0, }; diff --git a/stake-pool/program/tests/huge_pool.rs b/stake-pool/program/tests/huge_pool.rs index 9990ee3774c..1fd94683ffa 100644 --- a/stake-pool/program/tests/huge_pool.rs +++ b/stake-pool/program/tests/huge_pool.rs @@ -5,7 +5,7 @@ mod helpers; use { helpers::*, - solana_program::{borsh::try_from_slice_unchecked, pubkey::Pubkey, stake}, + solana_program::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey, stake}, solana_program_test::*, solana_sdk::{ native_token::LAMPORTS_PER_SOL, diff --git a/stake-pool/program/tests/initialize.rs b/stake-pool/program/tests/initialize.rs index 55e7c2fbfcd..5d0baba6716 100644 --- a/stake-pool/program/tests/initialize.rs +++ b/stake-pool/program/tests/initialize.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, + borsh0_10::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, hash::Hash, instruction::{AccountMeta, Instruction}, program_pack::Pack, diff --git a/stake-pool/program/tests/set_deposit_fee.rs b/stake-pool/program/tests/set_deposit_fee.rs index 85397ffb4c4..b8cbd286657 100644 --- a/stake-pool/program/tests/set_deposit_fee.rs +++ b/stake-pool/program/tests/set_deposit_fee.rs @@ -7,7 +7,7 @@ use { helpers::*, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, signature::{Keypair, Signer}, transaction::{Transaction, TransactionError}, diff --git a/stake-pool/program/tests/set_epoch_fee.rs b/stake-pool/program/tests/set_epoch_fee.rs index d1c5dc944cc..ccdb6b8d06b 100644 --- a/stake-pool/program/tests/set_epoch_fee.rs +++ b/stake-pool/program/tests/set_epoch_fee.rs @@ -7,7 +7,7 @@ use { helpers::*, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, signature::{Keypair, Signer}, transaction::{Transaction, TransactionError}, diff --git a/stake-pool/program/tests/set_funding_authority.rs b/stake-pool/program/tests/set_funding_authority.rs index 5fe7b8a959c..6e091562cae 100644 --- a/stake-pool/program/tests/set_funding_authority.rs +++ b/stake-pool/program/tests/set_funding_authority.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, hash::Hash, instruction::{AccountMeta, Instruction}, }, diff --git a/stake-pool/program/tests/set_manager.rs b/stake-pool/program/tests/set_manager.rs index 0dff30aa1b9..0e3416e098d 100644 --- a/stake-pool/program/tests/set_manager.rs +++ b/stake-pool/program/tests/set_manager.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, hash::Hash, instruction::{AccountMeta, Instruction}, }, diff --git a/stake-pool/program/tests/set_preferred.rs b/stake-pool/program/tests/set_preferred.rs index 04de8196404..fffd9bc26b1 100644 --- a/stake-pool/program/tests/set_preferred.rs +++ b/stake-pool/program/tests/set_preferred.rs @@ -8,7 +8,7 @@ use { solana_program::hash::Hash, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, signature::{Keypair, Signer}, diff --git a/stake-pool/program/tests/set_referral_fee.rs b/stake-pool/program/tests/set_referral_fee.rs index 829a2fb667c..93c225602e6 100644 --- a/stake-pool/program/tests/set_referral_fee.rs +++ b/stake-pool/program/tests/set_referral_fee.rs @@ -7,7 +7,7 @@ use { helpers::*, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, signature::{Keypair, Signer}, transaction::{Transaction, TransactionError}, diff --git a/stake-pool/program/tests/set_staker.rs b/stake-pool/program/tests/set_staker.rs index bf30fac6bf9..f2a72fe3e6e 100644 --- a/stake-pool/program/tests/set_staker.rs +++ b/stake-pool/program/tests/set_staker.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, hash::Hash, instruction::{AccountMeta, Instruction}, }, diff --git a/stake-pool/program/tests/set_withdrawal_fee.rs b/stake-pool/program/tests/set_withdrawal_fee.rs index 6f0afe68f7e..1d5106362cc 100644 --- a/stake-pool/program/tests/set_withdrawal_fee.rs +++ b/stake-pool/program/tests/set_withdrawal_fee.rs @@ -7,7 +7,7 @@ use { helpers::*, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, signature::{Keypair, Signer}, transaction::{Transaction, TransactionError}, diff --git a/stake-pool/program/tests/update_stake_pool_balance.rs b/stake-pool/program/tests/update_stake_pool_balance.rs index 763c7a80a4d..77612bf2c60 100644 --- a/stake-pool/program/tests/update_stake_pool_balance.rs +++ b/stake-pool/program/tests/update_stake_pool_balance.rs @@ -6,7 +6,7 @@ mod helpers; use { helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, }, solana_program_test::*, solana_sdk::{ diff --git a/stake-pool/program/tests/update_validator_list_balance.rs b/stake-pool/program/tests/update_validator_list_balance.rs index 9d494b45937..1c6b336916d 100644 --- a/stake-pool/program/tests/update_validator_list_balance.rs +++ b/stake-pool/program/tests/update_validator_list_balance.rs @@ -5,7 +5,7 @@ mod helpers; use { helpers::*, - solana_program::{borsh::try_from_slice_unchecked, program_pack::Pack, pubkey::Pubkey}, + solana_program::{borsh0_10::try_from_slice_unchecked, program_pack::Pack, pubkey::Pubkey}, solana_program_test::*, solana_sdk::{hash::Hash, signature::Signer, stake::state::StakeState}, spl_stake_pool::{ diff --git a/stake-pool/program/tests/update_validator_list_balance_hijack.rs b/stake-pool/program/tests/update_validator_list_balance_hijack.rs index 6de06cf3dd0..8ef0e59e775 100644 --- a/stake-pool/program/tests/update_validator_list_balance_hijack.rs +++ b/stake-pool/program/tests/update_validator_list_balance_hijack.rs @@ -5,7 +5,7 @@ mod helpers; use { helpers::*, - solana_program::{borsh::try_from_slice_unchecked, pubkey::Pubkey, stake}, + solana_program::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey, stake}, solana_program_test::*, solana_sdk::{ hash::Hash, diff --git a/stake-pool/program/tests/vsa_add.rs b/stake-pool/program/tests/vsa_add.rs index 28f40efa223..36eb049049d 100644 --- a/stake-pool/program/tests/vsa_add.rs +++ b/stake-pool/program/tests/vsa_add.rs @@ -8,7 +8,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, hash::Hash, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, @@ -284,6 +284,7 @@ async fn fail_without_signature() { AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), @@ -339,6 +340,7 @@ async fn fail_with_wrong_stake_program_id() { AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(wrong_stake_program, false), @@ -392,6 +394,7 @@ async fn fail_with_wrong_system_program_id() { AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(wrong_system_program, false), AccountMeta::new_readonly(stake::program::id(), false), diff --git a/stake-pool/program/tests/vsa_remove.rs b/stake-pool/program/tests/vsa_remove.rs index 6b795b84b95..187306377f5 100644 --- a/stake-pool/program/tests/vsa_remove.rs +++ b/stake-pool/program/tests/vsa_remove.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, stake, system_instruction, sysvar, diff --git a/stake-pool/program/tests/withdraw.rs b/stake-pool/program/tests/withdraw.rs index 8b5146c27c1..3fd449624b0 100644 --- a/stake-pool/program/tests/withdraw.rs +++ b/stake-pool/program/tests/withdraw.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, sysvar, diff --git a/stake-pool/program/tests/withdraw_edge_cases.rs b/stake-pool/program/tests/withdraw_edge_cases.rs index e495fea45f3..90cb5a7abc0 100644 --- a/stake-pool/program/tests/withdraw_edge_cases.rs +++ b/stake-pool/program/tests/withdraw_edge_cases.rs @@ -7,7 +7,7 @@ use { bincode::deserialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, }, solana_program_test::*, solana_sdk::{signature::Signer, transaction::TransactionError}, diff --git a/stake-pool/program/tests/withdraw_sol.rs b/stake-pool/program/tests/withdraw_sol.rs index 1d61e95ecb4..75c6594fb98 100644 --- a/stake-pool/program/tests/withdraw_sol.rs +++ b/stake-pool/program/tests/withdraw_sol.rs @@ -6,7 +6,7 @@ mod helpers; use { helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, }, solana_program_test::*, solana_sdk::{ diff --git a/stake-pool/program/tests/withdraw_with_fee.rs b/stake-pool/program/tests/withdraw_with_fee.rs index 243e3d4b87a..1a2b0134181 100644 --- a/stake-pool/program/tests/withdraw_with_fee.rs +++ b/stake-pool/program/tests/withdraw_with_fee.rs @@ -6,7 +6,7 @@ mod helpers; use { bincode::deserialize, helpers::*, - solana_program::{borsh::try_from_slice_unchecked, pubkey::Pubkey, stake}, + solana_program::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey, stake}, solana_program_test::*, solana_sdk::signature::{Keypair, Signer}, spl_stake_pool::{minimum_stake_lamports, state}, diff --git a/stateless-asks/program/src/processor.rs b/stateless-asks/program/src/processor.rs index 5f0a81e4a09..374a060505c 100644 --- a/stateless-asks/program/src/processor.rs +++ b/stateless-asks/program/src/processor.rs @@ -10,7 +10,7 @@ use { solana_program::{ account_info::next_account_info, account_info::AccountInfo, - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, entrypoint::ProgramResult, msg, program::{invoke, invoke_signed}, diff --git a/token-metadata/example/src/processor.rs b/token-metadata/example/src/processor.rs index 234ff414d52..1ff45bf12e3 100644 --- a/token-metadata/example/src/processor.rs +++ b/token-metadata/example/src/processor.rs @@ -3,7 +3,7 @@ use { solana_program::{ account_info::{next_account_info, AccountInfo}, - borsh::get_instance_packed_len, + borsh0_10::get_instance_packed_len, entrypoint::ProgramResult, msg, program::set_return_data, diff --git a/token-metadata/example/tests/emit.rs b/token-metadata/example/tests/emit.rs index c311b733cc5..00ef924d527 100644 --- a/token-metadata/example/tests/emit.rs +++ b/token-metadata/example/tests/emit.rs @@ -5,7 +5,7 @@ use { program_test::{setup, setup_metadata, setup_mint}, solana_program_test::tokio, solana_sdk::{ - borsh::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, + borsh0_10::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, signature::Signer, signer::keypair::Keypair, transaction::Transaction, }, spl_token_metadata_interface::{ diff --git a/token-metadata/interface/src/state.rs b/token-metadata/interface/src/state.rs index d8b140c9e99..08e54291bbb 100644 --- a/token-metadata/interface/src/state.rs +++ b/token-metadata/interface/src/state.rs @@ -3,7 +3,7 @@ use { borsh::{BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ - borsh::{get_instance_packed_len, try_from_slice_unchecked}, + borsh0_10::{get_instance_packed_len, try_from_slice_unchecked}, program_error::ProgramError, pubkey::Pubkey, }, diff --git a/token/client/src/output.rs b/token/client/src/output.rs index cc2dfc6ae6c..e3436ca435d 100644 --- a/token/client/src/output.rs +++ b/token/client/src/output.rs @@ -36,7 +36,7 @@ mod tests { #[test] fn display_signature() { let signature_bytes = [202u8; SIGNATURE_BYTES]; - let signature = RpcClientResponse::Signature(Signature::new(&signature_bytes)); + let signature = RpcClientResponse::Signature(Signature::from(signature_bytes)); println!("{}", signature); } diff --git a/token/program-2022-test/tests/token_metadata_emit.rs b/token/program-2022-test/tests/token_metadata_emit.rs index 425a56f59a3..cf5eb9932af 100644 --- a/token/program-2022-test/tests/token_metadata_emit.rs +++ b/token/program-2022-test/tests/token_metadata_emit.rs @@ -5,7 +5,7 @@ use { program_test::TestContext, solana_program_test::{processor, tokio, ProgramTest}, solana_sdk::{ - borsh::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, + borsh0_10::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, signature::Signer, signer::keypair::Keypair, transaction::Transaction, }, spl_token_2022::processor::Processor,