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

Add InstructionError for runtime instruction errors

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-13 11:46:49 -06:00
parent 959961b596
commit c14cce4c85
9 changed files with 79 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
programs/failure/tests/failure.rs
View File

@ -1,6 +1,7 @@
use solana_runtime::bank::Bank;
use solana_runtime::bank::BankError;
use solana_runtime::loader_utils::load_program;
use solana_runtime::runtime::InstructionError;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::native_loader;
use solana_sdk::native_program::ProgramError;
@ -25,6 +26,9 @@ fn test_program_native_failure() {
);
assert_eq!(
bank.process_transaction(&tx),
Err(BankError::ProgramError(0, ProgramError::GenericError))
Err(BankError::InstructionError(
0,
InstructionError::ProgramError(ProgramError::GenericError)
))
);
}

6
programs/vote/tests/vote.rs
View File

@ -1,5 +1,6 @@
use solana_runtime::bank::BankError;
use solana_runtime::bank::{Bank, Result};
use solana_runtime::runtime::InstructionError;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::hash::hash;
use solana_sdk::native_program::ProgramError;
@ -134,6 +135,9 @@ fn test_vote_via_bank_with_no_signature() {
assert_eq!(
result,
Err(BankError::ProgramError(1, ProgramError::InvalidArgument))
Err(BankError::InstructionError(
1,
InstructionError::ProgramError(ProgramError::InvalidArgument)
))
);
}