From 4b10458b3d538f8d0d9b31fbd1750f4831577010 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 8 Dec 2023 16:34:33 -0600
Subject: [PATCH] v1.17: Comment sysvar and builtin lists as deprecated and
 remove new keys (backport of #34365) (#34369)

Comment sysvar and builtin lists as deprecated and remove new keys (#34365)

(cherry picked from commit 79739e1b787d971c1c5912416446244710ebc09e)

Co-authored-by: Justin Starry <justin.starry@icloud.com>
---
 sdk/program/src/message/legacy.rs |  2 +-
 sdk/program/src/sysvar/mod.rs     | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/sdk/program/src/message/legacy.rs b/sdk/program/src/message/legacy.rs
index e81c7c485ff5f6..7c00813fcf6a9c 100644
--- a/sdk/program/src/message/legacy.rs
+++ b/sdk/program/src/message/legacy.rs
@@ -26,7 +26,7 @@ use {
 };
 
 lazy_static! {
-    // Copied keys over since direct references create cyclical dependency.
+    // This will be deprecated and so this list shouldn't be modified
     pub static ref BUILTIN_PROGRAMS_KEYS: [Pubkey; 10] = {
         let parse = |s| Pubkey::from_str(s).unwrap();
         [
diff --git a/sdk/program/src/sysvar/mod.rs b/sdk/program/src/sysvar/mod.rs
index 1bb7c12b33a728..5a5afec8bcf8a3 100644
--- a/sdk/program/src/sysvar/mod.rs
+++ b/sdk/program/src/sysvar/mod.rs
@@ -100,6 +100,7 @@ pub mod slot_history;
 pub mod stake_history;
 
 lazy_static! {
+    // This will be deprecated and so this list shouldn't be modified
     pub static ref ALL_IDS: Vec<Pubkey> = vec![
         clock::id(),
         epoch_schedule::id(),
@@ -113,8 +114,6 @@ lazy_static! {
         slot_history::id(),
         stake_history::id(),
         instructions::id(),
-        epoch_rewards::id(),
-        last_restart_slot::id(),
     ];
 }
 
@@ -138,12 +137,6 @@ macro_rules! declare_sysvar_id(
                 check_id(pubkey)
             }
         }
-
-        #[cfg(test)]
-        #[test]
-        fn test_sysvar_id() {
-            assert!($crate::sysvar::is_sysvar_id(&id()), "sysvar::is_sysvar_id() doesn't know about {}", $name);
-        }
     )
 );
 
@@ -164,12 +157,6 @@ macro_rules! declare_deprecated_sysvar_id(
                 check_id(pubkey)
             }
         }
-
-        #[cfg(test)]
-        #[test]
-        fn test_sysvar_id() {
-            assert!($crate::sysvar::is_sysvar_id(&id()), "sysvar::is_sysvar_id() doesn't know about {}", $name);
-        }
     )
 );