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

…34365)

(cherry picked from commit 79739e1)

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();
         [

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);
-        }
     )
 );