From 2515f6a04f92fbab38fff8f40cfdd9d4165b9722 Mon Sep 17 00:00:00 2001 From: Jack May Date: Tue, 26 Oct 2021 09:06:41 -0700 Subject: [PATCH] Update deprecation versions (#20959) --- client/src/blockhash_query.rs | 6 +++--- client/src/rpc_client.rs | 16 ++++++++-------- client/src/rpc_request.rs | 10 +++++----- runtime/src/bank.rs | 2 +- runtime/src/blockhash_queue.rs | 2 +- sdk/program/src/fee_calculator.rs | 2 +- sdk/program/src/sysvar/fees.rs | 2 +- sdk/program/src/sysvar/recent_blockhashes.rs | 8 ++++---- sdk/src/client.rs | 10 +++++----- sdk/src/recent_blockhashes_account.rs | 6 +++--- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/client/src/blockhash_query.rs b/client/src/blockhash_query.rs index af441185a..c18af1f42 100644 --- a/client/src/blockhash_query.rs +++ b/client/src/blockhash_query.rs @@ -19,7 +19,7 @@ pub enum Source { } impl Source { - #[deprecated(since = "1.8.0", note = "Please use `get_blockhash` instead")] + #[deprecated(since = "1.9.0", note = "Please use `get_blockhash` instead")] pub fn get_blockhash_and_fee_calculator( &self, rpc_client: &RpcClient, @@ -43,7 +43,7 @@ impl Source { } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] pub fn get_fee_calculator( @@ -134,7 +134,7 @@ impl BlockhashQuery { BlockhashQuery::new(blockhash, sign_only, nonce_account) } - #[deprecated(since = "1.8.0", note = "Please use `get_blockhash` instead")] + #[deprecated(since = "1.9.0", note = "Please use `get_blockhash` instead")] pub fn get_blockhash_and_fee_calculator( &self, rpc_client: &RpcClient, diff --git a/client/src/rpc_client.rs b/client/src/rpc_client.rs index f60082114..c5ffa63a7 100644 --- a/client/src/rpc_client.rs +++ b/client/src/rpc_client.rs @@ -4113,7 +4113,7 @@ impl RpcClient { } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use `get_latest_blockhash` and `get_fee_for_message` instead" )] #[allow(deprecated)] @@ -4123,7 +4123,7 @@ impl RpcClient { } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use `get_latest_blockhash_with_commitment` and `get_fee_for_message` instead" )] #[allow(deprecated)] @@ -4151,7 +4151,7 @@ impl RpcClient { }) } - #[deprecated(since = "1.8.0", note = "Please use `get_latest_blockhash` instead")] + #[deprecated(since = "1.9.0", note = "Please use `get_latest_blockhash` instead")] #[allow(deprecated)] pub fn get_recent_blockhash(&self) -> ClientResult<(Hash, FeeCalculator)> { #[allow(deprecated)] @@ -4162,7 +4162,7 @@ impl RpcClient { } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use `get_latest_blockhash_with_commitment` instead" )] #[allow(deprecated)] @@ -4229,7 +4229,7 @@ impl RpcClient { }) } - #[deprecated(since = "1.8.0", note = "Please `get_fee_for_message` instead")] + #[deprecated(since = "1.9.0", note = "Please `get_fee_for_message` instead")] #[allow(deprecated)] pub fn get_fee_calculator_for_blockhash( &self, @@ -4242,7 +4242,7 @@ impl RpcClient { } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please `get_latest_blockhash_with_commitment` and `get_fee_for_message` instead" )] #[allow(deprecated)] @@ -4266,7 +4266,7 @@ impl RpcClient { } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] #[allow(deprecated)] @@ -4284,7 +4284,7 @@ impl RpcClient { } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use `get_new_latest_blockhash` instead" )] #[allow(deprecated)] diff --git a/client/src/rpc_request.rs b/client/src/rpc_request.rs index eb3329e30..5ff675e65 100644 --- a/client/src/rpc_request.rs +++ b/client/src/rpc_request.rs @@ -43,18 +43,18 @@ pub enum RpcRequest { GetEpochInfo, GetEpochSchedule, #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use RpcRequest::GetFeeForMessage instead" )] GetFeeCalculatorForBlockhash, GetFeeForMessage, #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] GetFeeRateGovernor, #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use RpcRequest::GetFeeForMessage instead" )] GetFees, @@ -74,14 +74,14 @@ pub enum RpcRequest { GetMultipleAccounts, GetProgramAccounts, #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use RpcRequest::GetLatestBlockhash instead" )] GetRecentBlockhash, GetRecentPerformanceSamples, GetHighestSnapshotSlot, #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use RpcRequest::GetHighestSnapshotSlot instead" )] GetSnapshotSlot, diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 9e6537446..d9194d22f 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -3113,7 +3113,7 @@ impl Bank { blockhash_queue.get_lamports_per_signature(hash) } - #[deprecated(since = "1.8.0", note = "Please use `get_fee_for_message` instead")] + #[deprecated(since = "1.9.0", note = "Please use `get_fee_for_message` instead")] pub fn get_fee_rate_governor(&self) -> &FeeRateGovernor { &self.fee_rate_governor } diff --git a/runtime/src/blockhash_queue.rs b/runtime/src/blockhash_queue.rs index 8f39d7ea3..c903b7afb 100644 --- a/runtime/src/blockhash_queue.rs +++ b/runtime/src/blockhash_queue.rs @@ -123,7 +123,7 @@ impl BlockhashQueue { } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] #[allow(deprecated)] diff --git a/sdk/program/src/fee_calculator.rs b/sdk/program/src/fee_calculator.rs index 81bda2380..41ecffd78 100644 --- a/sdk/program/src/fee_calculator.rs +++ b/sdk/program/src/fee_calculator.rs @@ -21,7 +21,7 @@ impl FeeCalculator { } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] pub fn calculate_fee(&self, message: &Message) -> u64 { diff --git a/sdk/program/src/sysvar/fees.rs b/sdk/program/src/sysvar/fees.rs index 2981ca470..24a882395 100644 --- a/sdk/program/src/sysvar/fees.rs +++ b/sdk/program/src/sysvar/fees.rs @@ -9,7 +9,7 @@ use crate::{ crate::declare_deprecated_sysvar_id!("SysvarFees111111111111111111111111111111111", Fees); #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] #[repr(C)] diff --git a/sdk/program/src/sysvar/recent_blockhashes.rs b/sdk/program/src/sysvar/recent_blockhashes.rs index b9e553312..e67213546 100644 --- a/sdk/program/src/sysvar/recent_blockhashes.rs +++ b/sdk/program/src/sysvar/recent_blockhashes.rs @@ -9,7 +9,7 @@ use crate::{ use std::{cmp::Ordering, collections::BinaryHeap, iter::FromIterator, ops::Deref}; #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] pub const MAX_ENTRIES: usize = 150; @@ -20,7 +20,7 @@ declare_deprecated_sysvar_id!( ); #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] #[repr(C)] @@ -39,7 +39,7 @@ impl Entry { } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] #[derive(Clone, Debug)] @@ -70,7 +70,7 @@ impl<'a> PartialOrd for IterItem<'a> { /// The entries are ordered by descending block height, so the first entry holds /// the most recent block hash, and the last entry holds an old block hash. #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] #[repr(C)] diff --git a/sdk/src/client.rs b/sdk/src/client.rs index 8e2442365..48378f362 100644 --- a/sdk/src/client.rs +++ b/sdk/src/client.rs @@ -81,12 +81,12 @@ pub trait SyncClient { fn get_minimum_balance_for_rent_exemption(&self, data_len: usize) -> Result; /// Get recent blockhash - #[deprecated(since = "1.8.0", note = "Please use `get_latest_blockhash` instead")] + #[deprecated(since = "1.9.0", note = "Please use `get_latest_blockhash` instead")] fn get_recent_blockhash(&self) -> Result<(Hash, FeeCalculator)>; /// Get recent blockhash. Uses explicit commitment configuration. #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use `get_latest_blockhash_with_commitment` and `get_fee_for_message` instead" )] fn get_recent_blockhash_with_commitment( @@ -97,14 +97,14 @@ pub trait SyncClient { /// Get `Some(FeeCalculator)` associated with `blockhash` if it is still in /// the BlockhashQueue`, otherwise `None` #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use `get_fee_for_message` or `is_blockhash_valid` instead" )] fn get_fee_calculator_for_blockhash(&self, blockhash: &Hash) -> Result>; /// Get recent fee rate governor #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] fn get_fee_rate_governor(&self) -> Result; @@ -150,7 +150,7 @@ pub trait SyncClient { fn poll_for_signature(&self, signature: &Signature) -> Result<()>; #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please use `get_new_latest_blockhash` instead" )] fn get_new_blockhash(&self, blockhash: &Hash) -> Result<(Hash, FeeCalculator)>; diff --git a/sdk/src/recent_blockhashes_account.rs b/sdk/src/recent_blockhashes_account.rs index 4f6ca6c65..1aac867a1 100644 --- a/sdk/src/recent_blockhashes_account.rs +++ b/sdk/src/recent_blockhashes_account.rs @@ -10,7 +10,7 @@ use solana_program::sysvar::recent_blockhashes::{ use std::{collections::BinaryHeap, iter::FromIterator}; #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] #[allow(deprecated)] @@ -45,7 +45,7 @@ where } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] #[allow(deprecated)] @@ -65,7 +65,7 @@ where } #[deprecated( - since = "1.8.0", + since = "1.9.0", note = "Please do not use, will no longer be available in the future" )] #[allow(deprecated)]