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

Fix which shared object the test uses (#15060)

Browse Source
This commit is contained in:
Jack May
2021-02-03 13:31:55 -08:00
committed by GitHub
parent 2b9a0311d3
commit 02a5f7104a
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

@ -1655,7 +1655,7 @@ fn test_program_bpf_upgrade_and_invoke_in_same_tx() {
&buffer_keypair, &buffer_keypair,
&program_keypair, &program_keypair,
&authority_keypair, &authority_keypair,
"noop", "solana_bpf_rust_noop",
); );
let invoke_instruction = Instruction::new( let invoke_instruction = Instruction::new(
@ -1680,7 +1680,7 @@ fn test_program_bpf_upgrade_and_invoke_in_same_tx() {
&mint_keypair, &mint_keypair,
&buffer_keypair, &buffer_keypair,
&authority_keypair, &authority_keypair,
"panic", "solana_bpf_rust_panic",
); );
// Invoke, then upgrade the program, and then invoke again in same tx // Invoke, then upgrade the program, and then invoke again in same tx
@ -1826,7 +1826,7 @@ fn test_program_bpf_disguised_as_bpf_loader() {
} }
#[cfg(feature = "bpf_rust")] #[cfg(feature = "bpf_rust")]
{ {
programs.extend_from_slice(&[("noop")]); programs.extend_from_slice(&[("solana_bpf_rust_noop")]);
} }
for program in programs.iter() { for program in programs.iter() {
@ -1970,7 +1970,12 @@ fn test_program_bpf_upgrade_self_via_cpi() {
bank.add_builtin(&name, id, entrypoint); bank.add_builtin(&name, id, entrypoint);
let bank = Arc::new(bank); let bank = Arc::new(bank);
let bank_client = BankClient::new_shared(&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 // Deploy upgradeable program
let buffer_keypair = Keypair::new(); let buffer_keypair = Keypair::new();
@ -2010,7 +2015,7 @@ fn test_program_bpf_upgrade_self_via_cpi() {
&mint_keypair, &mint_keypair,
&buffer_keypair, &buffer_keypair,
&authority_keypair, &authority_keypair,
"panic", "solana_bpf_rust_panic",
); );
// Invoke, then upgrade the program, and then invoke again in same tx // Invoke, then upgrade the program, and then invoke again in same tx