gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix loader instruction checker (#18047) (#18073)

Browse Source 
(cherry picked from commit d18e02ef44)

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2021-06-18 21:06:23 +00:00
committed by GitHub
parent 0afb330db0
commit 4aedc086e5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/program/src/bpf_loader_upgradeable.rs
View File

@ -189,11 +189,11 @@ pub fn upgrade(
} }
pub fn is_upgrade_instruction(instruction_data: &[u8]) -> bool { pub fn is_upgrade_instruction(instruction_data: &[u8]) -> bool {
3 == instruction_data[0] !instruction_data.is_empty() && 3 == instruction_data[0]
} }
pub fn is_set_authority_instruction(instruction_data: &[u8]) -> bool { pub fn is_set_authority_instruction(instruction_data: &[u8]) -> bool {
4 == instruction_data[0] !instruction_data.is_empty() && 4 == instruction_data[0]
} }
/// Returns the instructions required to set a buffers's authority. /// Returns the instructions required to set a buffers's authority.
@ -331,6 +331,7 @@ mod tests {
#[test] #[test]
fn test_is_set_authority_instruction() { fn test_is_set_authority_instruction() {
assert!(!is_set_authority_instruction(&[]));
assert_is_instruction( assert_is_instruction(
is_set_authority_instruction, is_set_authority_instruction,
UpgradeableLoaderInstruction::SetAuthority {}, UpgradeableLoaderInstruction::SetAuthority {},
@ -339,6 +340,7 @@ mod tests {
#[test] #[test]
fn test_is_upgrade_instruction() { fn test_is_upgrade_instruction() {
assert!(!is_upgrade_instruction(&[]));
assert_is_instruction( assert_is_instruction(
is_upgrade_instruction, is_upgrade_instruction,
UpgradeableLoaderInstruction::Upgrade {}, UpgradeableLoaderInstruction::Upgrade {},