Skip to content

Commit

Permalink
Remove workaround compiler crash (#2338)
Browse files Browse the repository at this point in the history
Remove workaround 16-byte aligned crash
  • Loading branch information
LucasSte authored Aug 2, 2024
1 parent cb782d0 commit 0ea4543
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions programs/sbf/rust/sysvar/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub fn process_instruction(
sysvar::clock::id().log();
let clock = Clock::from_account_info(&accounts[2]).unwrap();
assert_ne!(clock, Clock::default());
let got_clock = Clock::get().unwrap();
let got_clock = Clock::get()?;
assert_eq!(clock, got_clock);
}

Expand All @@ -39,17 +39,16 @@ pub fn process_instruction(
sysvar::epoch_schedule::id().log();
let epoch_schedule = EpochSchedule::from_account_info(&accounts[3]).unwrap();
assert_eq!(epoch_schedule, EpochSchedule::default());
let got_epoch_schedule = EpochSchedule::get().unwrap();
let got_epoch_schedule = EpochSchedule::get()?;
assert_eq!(epoch_schedule, got_epoch_schedule);
}

// Instructions
msg!("Instructions identifier:");
sysvar::instructions::id().log();
assert_eq!(*accounts[4].owner, sysvar::id());
let index = instructions::load_current_index_checked(&accounts[4]).unwrap();
let instruction =
instructions::load_instruction_at_checked(index as usize, &accounts[4]).unwrap();
let index = instructions::load_current_index_checked(&accounts[4])?;
let instruction = instructions::load_instruction_at_checked(index as usize, &accounts[4])?;
assert_eq!(0, index);
assert_eq!(
instruction,
Expand Down Expand Up @@ -86,7 +85,7 @@ pub fn process_instruction(
msg!("Rent identifier:");
sysvar::rent::id().log();
let rent = Rent::from_account_info(&accounts[6]).unwrap();
let got_rent = Rent::get().unwrap();
let got_rent = Rent::get()?;
assert_eq!(rent, got_rent);
}

Expand Down Expand Up @@ -116,7 +115,7 @@ pub fn process_instruction(
msg!("EpochRewards identifier:");
sysvar::epoch_rewards::id().log();
let epoch_rewards = EpochRewards::from_account_info(&accounts[10]).unwrap();
let got_epoch_rewards = EpochRewards::get().unwrap();
let got_epoch_rewards = EpochRewards::get()?;
assert_eq!(epoch_rewards, got_epoch_rewards);
}

Expand Down

0 comments on commit 0ea4543

Please sign in to comment.