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

Build full SPL in CI (bp #15886) (#15964)

Browse Source 
* Build full SPL in CI

(cherry picked from commit 82269f1351)

* Avoid changing signature of ProgramTest::add_account

(cherry picked from commit 03180b502d)

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2021-03-17 22:46:55 +00:00
committed by GitHub
parent af45efb62c
commit f5d56eabf3
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
program-test/src/lib.rs
View File

@ -476,8 +476,9 @@ impl ProgramTest {
} }
/// Add an account to the test environment /// Add an account to the test environment
pub fn add_account(&mut self, address: Pubkey, account: AccountSharedData) { pub fn add_account(&mut self, address: Pubkey, account: Account) {
self.accounts.push((address, account)); self.accounts
.push((address, AccountSharedData::from(account)));
} }
/// Add an account to the test environment with the account data in the provided `filename` /// Add an account to the test environment with the account data in the provided `filename`
@ -490,7 +491,7 @@ impl ProgramTest {
) { ) {
self.add_account( self.add_account(
address, address,
AccountSharedData::from(Account { Account {
lamports, lamports,
data: read_file(find_file(filename).unwrap_or_else(|| { data: read_file(find_file(filename).unwrap_or_else(|| {
panic!("Unable to locate {}", filename); panic!("Unable to locate {}", filename);
@ -498,7 +499,7 @@ impl ProgramTest {
owner, owner,
executable: false, executable: false,
rent_epoch: 0, rent_epoch: 0,
}), },
); );
} }
@ -513,14 +514,14 @@ impl ProgramTest {
) { ) {
self.add_account( self.add_account(
address, address,
AccountSharedData::from(Account { Account {
lamports, lamports,
data: base64::decode(data_base64) data: base64::decode(data_base64)
.unwrap_or_else(|err| panic!("Failed to base64 decode: {}", err)), .unwrap_or_else(|err| panic!("Failed to base64 decode: {}", err)),
owner, owner,
executable: false, executable: false,
rent_epoch: 0, rent_epoch: 0,
}), },
); );
} }
@ -576,13 +577,13 @@ impl ProgramTest {
self.add_account( self.add_account(
program_id, program_id,
AccountSharedData::from(Account { Account {
lamports: Rent::default().minimum_balance(data.len()).min(1), lamports: Rent::default().minimum_balance(data.len()).min(1),
data, data,
owner: loader, owner: loader,
executable: true, executable: true,
rent_epoch: 0, rent_epoch: 0,
}), },
); );
} else { } else {
info!("\"{}\" program loaded as native code", program_name); info!("\"{}\" program loaded as native code", program_name);

11
scripts/build-downstream-projects.sh
View File

@ -67,15 +67,8 @@ spl() {
./patch.crates-io.sh "$solana_dir" ./patch.crates-io.sh "$solana_dir"
$cargo build $cargo build
$cargo test
# Generic `cargo test`/`cargo test-bpf` disabled due to BPF VM interface changes between Solana 1.4 $cargo_test_bpf
# and 1.5...
#$cargo test
#$cargo_test_bpf
$cargo_test_bpf --manifest-path token/program/Cargo.toml
$cargo_test_bpf --manifest-path associated-token-account/program/Cargo.toml
$cargo_test_bpf --manifest-path feature-proposal/program/Cargo.toml
) )
} }