Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit 4b10458

Browse files
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 79739e1) Co-authored-by: Justin Starry <justin.starry@icloud.com>
1 parent d1858aa commit 4b10458

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

sdk/program/src/message/legacy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use {
2626
};
2727

2828
lazy_static! {
29-
// Copied keys over since direct references create cyclical dependency.
29+
// This will be deprecated and so this list shouldn't be modified
3030
pub static ref BUILTIN_PROGRAMS_KEYS: [Pubkey; 10] = {
3131
let parse = |s| Pubkey::from_str(s).unwrap();
3232
[

sdk/program/src/sysvar/mod.rs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ pub mod slot_history;
100100
pub mod stake_history;
101101

102102
lazy_static! {
103+
// This will be deprecated and so this list shouldn't be modified
103104
pub static ref ALL_IDS: Vec<Pubkey> = vec![
104105
clock::id(),
105106
epoch_schedule::id(),
@@ -113,8 +114,6 @@ lazy_static! {
113114
slot_history::id(),
114115
stake_history::id(),
115116
instructions::id(),
116-
epoch_rewards::id(),
117-
last_restart_slot::id(),
118117
];
119118
}
120119

@@ -138,12 +137,6 @@ macro_rules! declare_sysvar_id(
138137
check_id(pubkey)
139138
}
140139
}
141-
142-
#[cfg(test)]
143-
#[test]
144-
fn test_sysvar_id() {
145-
assert!($crate::sysvar::is_sysvar_id(&id()), "sysvar::is_sysvar_id() doesn't know about {}", $name);
146-
}
147140
)
148141
);
149142

@@ -164,12 +157,6 @@ macro_rules! declare_deprecated_sysvar_id(
164157
check_id(pubkey)
165158
}
166159
}
167-
168-
#[cfg(test)]
169-
#[test]
170-
fn test_sysvar_id() {
171-
assert!($crate::sysvar::is_sysvar_id(&id()), "sysvar::is_sysvar_id() doesn't know about {}", $name);
172-
}
173160
)
174161
);
175162

0 commit comments

Comments
 (0)