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

Fix broken build from bpf/tests/programs.rs (#22312)

Browse Source 
These tests were broken due to PR #22289
This commit is contained in:
Brooks Prumo
2022-01-05 15:06:15 -06:00
committed by GitHub
parent ba0188a36d
commit 840ec0686e
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,10 +57,6 @@ use solana_transaction_status::{
token_balances::collect_token_balances, ConfirmedTransaction, InnerInstructions, token_balances::collect_token_balances, ConfirmedTransaction, InnerInstructions,
TransactionStatusMeta, TransactionWithStatusMeta, TransactionStatusMeta, TransactionWithStatusMeta,
}; };
use std::{
collections::HashMap, env, fs::File, io::Read, path::PathBuf, str::FromStr,
sync::Arc,
};
use std::{collections::HashMap, env, fs::File, io::Read, path::PathBuf, str::FromStr, sync::Arc}; use std::{collections::HashMap, env, fs::File, io::Read, path::PathBuf, str::FromStr, sync::Arc};
/// BPF program file extension /// BPF program file extension
@ -1751,13 +1747,8 @@ fn test_program_bpf_upgrade() {
"solana_bpf_rust_upgradeable", "solana_bpf_rust_upgradeable",
); );
let mut instruction = Instruction::new_with_bytes( let mut instruction =
program_id, Instruction::new_with_bytes(program_id, &[0], vec![AccountMeta::new(clock::id(), false)]);
&[0],
vec![
AccountMeta::new(clock::id(), false),
],
);
// Call upgrade program // Call upgrade program
let result = bank_client.send_and_confirm_instruction(&mint_keypair, instruction.clone()); let result = bank_client.send_and_confirm_instruction(&mint_keypair, instruction.clone());
@ -1845,13 +1836,8 @@ fn test_program_bpf_upgrade_and_invoke_in_same_tx() {
"solana_bpf_rust_noop", "solana_bpf_rust_noop",
); );
let invoke_instruction = Instruction::new_with_bytes( let invoke_instruction =
program_id, Instruction::new_with_bytes(program_id, &[0], vec![AccountMeta::new(clock::id(), false)]);
&[0],
vec![
AccountMeta::new(clock::id(), false),
],
);
// Call upgradeable program // Call upgradeable program
let result = let result =
@ -2464,7 +2450,7 @@ fn test_program_upgradeable_locks() {
assert!(matches!( assert!(matches!(
results1[0], results1[0],
Ok(ConfirmedTransactionWithStatusMeta { Ok(ConfirmedTransaction {
transaction: TransactionWithStatusMeta { transaction: TransactionWithStatusMeta {
meta: Some(TransactionStatusMeta { status: Ok(()), .. }), meta: Some(TransactionStatusMeta { status: Ok(()), .. }),
.. ..
@ -2476,7 +2462,7 @@ fn test_program_upgradeable_locks() {
assert!(matches!( assert!(matches!(
results2[0], results2[0],
Ok(ConfirmedTransactionWithStatusMeta { Ok(ConfirmedTransaction {
transaction: TransactionWithStatusMeta { transaction: TransactionWithStatusMeta {
meta: Some(TransactionStatusMeta { meta: Some(TransactionStatusMeta {
status: Err(TransactionError::InstructionError( status: Err(TransactionError::InstructionError(