v2.0: Deprecate RpcRequest::GetStakeActivation (backport of anza-xyz#…

…2005) (anza-xyz#2013) Deprecate RpcRequest::GetStakeActivation (anza-xyz#2005) * Correct deprecation note * Deprecate rpc-client-api request (cherry picked from commit 0deb6fb) Co-authored-by: Tyera <tyera@anza.xyz>
nitro-svm · Jul 17, 2024 · 1a01d6c · 1a01d6c
1 parent dddc623
commit 1a01d6c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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)]