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

Generalize error codes

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-13 12:48:11 -06:00
parent 1de5ae1ef0
commit 296415945a
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/src/system_program.rs
View File

@ -85,7 +85,7 @@ pub fn entrypoint(
// All system instructions require that accounts_keys[0] be a signer
if keyed_accounts[FROM_ACCOUNT_INDEX].signer_key().is_none() {
info!("account[from] is unsigned");
Err(ProgramError::InvalidArgument)?;
Err(ProgramError::MissingRequiredSignature)?;
}
match instruction {
@ -96,7 +96,7 @@ pub fn entrypoint(
} => create_system_account(keyed_accounts, lamports, space, &program_id),
SystemInstruction::Assign { program_id } => {
if !system_program::check_id(&keyed_accounts[FROM_ACCOUNT_INDEX].account.owner) {
Err(ProgramError::AssignOfUnownedAccount)?;
Err(ProgramError::IncorrectProgramId)?;
}
assign_account_to_program(keyed_accounts, &program_id)
}
@ -245,7 +245,7 @@ mod tests {
};
let data = serialize(&instruction).unwrap();
let result = entrypoint(&system_program::id(), &mut keyed_accounts, &data, 0);
assert_eq!(result, Err(ProgramError::AssignOfUnownedAccount));
assert_eq!(result, Err(ProgramError::IncorrectProgramId));
assert_eq!(from_account.owner, new_program_owner);
}