From 0deb6fb3f2022fd56a4457a2bb03c49146af90d4 Mon Sep 17 00:00:00 2001
From: Tyera <tyera@anza.xyz>
Date: Thu, 4 Jul 2024 02:18:56 -0600
Subject: [PATCH] Deprecate RpcRequest::GetStakeActivation (#2005)

* Correct deprecation note

* Deprecate rpc-client-api request
---
 rpc-client-api/src/request.rs            | 8 +++++++-
 rpc-client/src/nonblocking/rpc_client.rs | 5 +++--
 rpc-client/src/rpc_client.rs             | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

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 bcaf3e16f41d0b..532b6176032e5e 100644
--- a/rpc-client/src/nonblocking/rpc_client.rs
+++ b/rpc-client/src/nonblocking/rpc_client.rs
@@ -2078,10 +2078,11 @@ 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)]
     pub async fn get_stake_activation(
         &self,
         stake_account: Pubkey,
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)]