From ee29daa47036f559bf6111324af3748ad5c5a39b Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Wed, 3 Jul 2024 14:25:25 -0600 Subject: [PATCH 1/2] Correct deprecation note --- rpc-client/src/nonblocking/rpc_client.rs | 4 ++-- rpc-client/src/rpc_client.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpc-client/src/nonblocking/rpc_client.rs b/rpc-client/src/nonblocking/rpc_client.rs index bcaf3e16f41d0b..45509b4bb3ddc2 100644 --- a/rpc-client/src/nonblocking/rpc_client.rs +++ b/rpc-client/src/nonblocking/rpc_client.rs @@ -2078,8 +2078,8 @@ impl RpcClient { /// ``` #[deprecated( since = "1.18.18", - note = "Do not use; getStakeActivation is deprecated on the JSON-RPC server. Please use \ - the stake account and StakeHistory sysvar to call \ + note = "Do not use; getStakeActivation is not supported by the JSON-RPC server. Please \ + use the stake account and StakeHistory sysvar to call \ `Delegation::stake_activating_and_deactivating()` instead" )] pub async fn get_stake_activation( diff --git a/rpc-client/src/rpc_client.rs b/rpc-client/src/rpc_client.rs index eedb1c14ec1539..d81a0e5067efcd 100644 --- a/rpc-client/src/rpc_client.rs +++ b/rpc-client/src/rpc_client.rs @@ -1776,8 +1776,8 @@ impl RpcClient { /// ``` #[deprecated( since = "1.18.18", - note = "Do not use; getStakeActivation is deprecated on the JSON-RPC server. Please use \ - the stake account and StakeHistory sysvar to call \ + note = "Do not use; getStakeActivation is not supported by the JSON-RPC server. Please \ + use the stake account and StakeHistory sysvar to call \ `Delegation::stake_activating_and_deactivating()` instead" )] #[allow(deprecated)] From 58cf37c78b1e4c9408a55f2ae85447d7879a395c Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Wed, 3 Jul 2024 14:25:51 -0600 Subject: [PATCH 2/2] Deprecate rpc-client-api request --- rpc-client-api/src/request.rs | 8 +++++++- rpc-client/src/nonblocking/rpc_client.rs | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/rpc-client-api/src/request.rs b/rpc-client-api/src/request.rs index 1bcc42179d96ec..f26024e7afbb19 100644 --- a/rpc-client-api/src/request.rs +++ b/rpc-client-api/src/request.rs @@ -8,7 +8,9 @@ use { #[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)] pub enum RpcRequest { - Custom { method: &'static str }, + Custom { + method: &'static str, + }, DeregisterNode, GetAccountInfo, GetBalance, @@ -48,6 +50,10 @@ pub enum RpcRequest { GetStorageTurn, GetStorageTurnRate, GetSlotsPerSegment, + #[deprecated( + since = "1.18.18", + note = "Do not use; getStakeActivation is not supported by the JSON-RPC server." + )] GetStakeActivation, GetStakeMinimumDelegation, GetStoragePubkeysForSlot, diff --git a/rpc-client/src/nonblocking/rpc_client.rs b/rpc-client/src/nonblocking/rpc_client.rs index 45509b4bb3ddc2..532b6176032e5e 100644 --- a/rpc-client/src/nonblocking/rpc_client.rs +++ b/rpc-client/src/nonblocking/rpc_client.rs @@ -2082,6 +2082,7 @@ impl RpcClient { use the stake account and StakeHistory sysvar to call \ `Delegation::stake_activating_and_deactivating()` instead" )] + #[allow(deprecated)] pub async fn get_stake_activation( &self, stake_account: Pubkey,