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

Fix which shared object the test uses (bp #15060) (#15067)

Browse Source 
* Fix which shared object the test uses (#15060)

(cherry picked from commit 02a5f7104a)

# Conflicts:
#	programs/bpf/tests/programs.rs

* fix conflicts

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2021-02-03 23:14:09 +00:00
committed by GitHub
parent 5baad4f6b6
commit ba733168c6
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
programs/bpf/tests/programs.rs
View File

@ -1532,7 +1532,7 @@ fn test_program_bpf_upgrade_and_invoke_in_same_tx() {
&buffer_keypair,
&program_keypair,
&authority_keypair,
"noop",
"solana_bpf_rust_noop",
);
let invoke_instruction = Instruction::new(
@ -1552,7 +1552,7 @@ fn test_program_bpf_upgrade_and_invoke_in_same_tx() {
// Prepare for upgrade
let buffer_keypair = Keypair::new();
let path = create_bpf_path("panic");
let path = create_bpf_path("solana_bpf_rust_panic");
let mut file = File::open(&path).unwrap_or_else(|err| {
panic!("Failed to open {}: {}", path.display(), err);
});
@ -1709,7 +1709,7 @@ fn test_program_bpf_disguised_as_bpf_loader() {
}
#[cfg(feature = "bpf_rust")]
{
programs.extend_from_slice(&[("noop")]);
programs.extend_from_slice(&[("solana_bpf_rust_noop")]);
}
for program in programs.iter() {
@ -1853,7 +1853,12 @@ fn test_program_bpf_upgrade_self_via_cpi() {
bank.add_builtin(&name, id, entrypoint);
let bank = Arc::new(bank);
let bank_client = BankClient::new_shared(&bank);
let noop_program_id = load_bpf_program(&bank_client, &bpf_loader::id(), &mint_keypair, "noop");
let noop_program_id = load_bpf_program(
&bank_client,
&bpf_loader::id(),
&mint_keypair,
"solana_bpf_rust_noop",
);
// Deploy upgradeable program
let buffer_keypair = Keypair::new();
@ -1888,7 +1893,7 @@ fn test_program_bpf_upgrade_self_via_cpi() {
// Prepare for upgrade
let buffer_keypair = Keypair::new();
let path = create_bpf_path("panic");
let path = create_bpf_path("solana_bpf_rust_panic");
let mut file = File::open(&path).unwrap_or_else(|err| {
panic!("Failed to open {}: {}", path.display(), err);
});