blockworks-foundation
/
solana-program-library
mirror of https://github.com/blockworks-foundation/solana-program-library.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ci: Update rust-nightly to 2022-04-01 (#3539) 

* ci: Update rust-nightly to 2022-04-01

* Use rust_nightly parameter in fuzz script
This commit is contained in:
Jon Cinque 2022-08-27 18:20:12 +02:00 committed by GitHub
parent a04fa3ad08
commit 90626fc4c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/fuzz.sh
View File

@ -28,7 +28,7 @@ fi
# Temporary workaround using RUSTFLAGS and rust nightly due to: # Temporary workaround using RUSTFLAGS and rust nightly due to:
# https://github.com/rust-fuzz/honggfuzz-rs/issues/61 # https://github.com/rust-fuzz/honggfuzz-rs/issues/61
# Once the issue is resolved, remove the RUSTFLAGS and nightly usage everywhere. # Once the issue is resolved, remove the RUSTFLAGS and nightly usage everywhere.
RUSTFLAGS="-Znew-llvm-pass-manager=no" HFUZZ_RUN_ARGS="--run_time $run_time --exit_upon_crash" cargo +nightly-2022-02-24 hfuzz run $fuzz_target RUSTFLAGS="-Znew-llvm-pass-manager=no" HFUZZ_RUN_ARGS="--run_time $run_time --exit_upon_crash" cargo +"$rust_nightly" hfuzz run $fuzz_target
# Until https://github.com/rust-fuzz/honggfuzz-rs/issues/16 is resolved, # Until https://github.com/rust-fuzz/honggfuzz-rs/issues/16 is resolved,
# hfuzz does not return an error code on crash, so look for a crash artifact # hfuzz does not return an error code on crash, so look for a crash artifact

2
ci/rust-version.sh
View File

@ -26,7 +26,7 @@ fi
if [[ -n $RUST_NIGHTLY_VERSION ]]; then if [[ -n $RUST_NIGHTLY_VERSION ]]; then
nightly_version="$RUST_NIGHTLY_VERSION" nightly_version="$RUST_NIGHTLY_VERSION"
else else
nightly_version=2022-02-24 nightly_version=2022-04-01
fi fi
export rust_stable="$stable_version" export rust_stable="$stable_version"

6
stake-pool/program/src/state.rs
View File

@ -20,7 +20,7 @@ use {
}, },
spl_math::checked_ceil_div::CheckedCeilDiv, spl_math::checked_ceil_div::CheckedCeilDiv,
spl_token::state::{Account, AccountState}, spl_token::state::{Account, AccountState},
std::{convert::TryFrom, fmt, matches}, std::{borrow::Borrow, convert::TryFrom, fmt, matches},
}; };
/// Enum representing the account type managed by the program /// Enum representing the account type managed by the program
@ -289,7 +289,7 @@ impl StakePool {
&self, &self,
manager_fee_info: &AccountInfo, manager_fee_info: &AccountInfo,
) -> Result<(), ProgramError> { ) -> Result<(), ProgramError> {
let token_account = Account::unpack(&manager_fee_info.data.borrow())?; let token_account = Account::unpack(&manager_fee_info.try_borrow_data()?)?;
if manager_fee_info.owner != &self.token_program_id if manager_fee_info.owner != &self.token_program_id
|| token_account.state != AccountState::Initialized || token_account.state != AccountState::Initialized
|| token_account.mint != self.pool_mint || token_account.mint != self.pool_mint
@ -684,7 +684,7 @@ impl ValidatorListHeader {
/// Extracts the validator list into its header and internal BigVec /// Extracts the validator list into its header and internal BigVec
pub fn deserialize_vec(data: &mut [u8]) -> Result<(Self, BigVec), ProgramError> { pub fn deserialize_vec(data: &mut [u8]) -> Result<(Self, BigVec), ProgramError> {
let mut data_mut = &data[..]; let mut data_mut = data.borrow();
let header = ValidatorListHeader::deserialize(&mut data_mut)?; let header = ValidatorListHeader::deserialize(&mut data_mut)?;
let length = get_instance_packed_len(&header)?; let length = get_instance_packed_len(&header)?;