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

CustomError from Vec->u32

Browse Source
This commit is contained in:
Tyera Eulberg
2019-04-11 11:41:12 -07:00
committed by Tyera Eulberg
parent f669ae5868
commit d31989f878
5 changed files with 12 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
runtime/src/message_processor.rs
View File

@ -72,16 +72,6 @@ fn verify_instruction(
Ok(())
}
fn verify_error(err: InstructionError) -> InstructionError {
match err {
InstructionError::CustomError(mut error) => {
error.truncate(32);
InstructionError::CustomError(error)
}
e => e,
}
}
pub type ProcessInstruction =
fn(&Pubkey, &mut [KeyedAccount], &[u8], u64) -> Result<(), InstructionError>;
@ -185,8 +175,7 @@ impl MessageProcessor {
executable_accounts,
program_accounts,
tick_height,
)
.map_err(verify_error)?;
)?;
// Verify the instruction
for ((pre_program_id, pre_lamports, pre_data), post_account) in
@ -321,19 +310,4 @@ mod tests {
"malicious Mallory should not be able to change the account data"
);
}
#[test]
fn test_verify_error() {
let short_error = InstructionError::CustomError(vec![1, 2, 3]);
let expected_short_error = short_error.clone(); // short CustomError errors should be untouched
assert_eq!(verify_error(short_error), expected_short_error);
let long_error = InstructionError::CustomError(vec![8; 40]);
let expected_long_error = InstructionError::CustomError(vec![8; 32]); // long CustomError errors should be truncated
assert_eq!(verify_error(long_error), expected_long_error);
let other_error = InstructionError::GenericError;
let expected_other_error = other_error.clone(); // non-CustomError errors should be untouched
assert_eq!(verify_error(other_error), expected_other_error);
}
}

4
runtime/src/system_instruction_processor.rs
View File

@ -1,4 +1,3 @@
use bincode::serialize;
use log::*;
use solana_sdk::account::KeyedAccount;
use solana_sdk::instruction::InstructionError;
@ -94,7 +93,7 @@ pub fn process_instruction(
}
SystemInstruction::Transfer { lamports } => move_lamports(keyed_accounts, lamports),
}
.map_err(|e| InstructionError::CustomError(serialize(&e).unwrap()))
.map_err(|e| InstructionError::CustomError(e as u32))
} else {
debug!("Invalid instruction data: {:?}", data);
Err(InstructionError::InvalidInstructionData)
@ -106,6 +105,7 @@ mod tests {
use super::*;
use crate::bank::Bank;
use crate::bank_client::BankClient;
use bincode::serialize;
use solana_sdk::account::Account;
use solana_sdk::client::SyncClient;
use solana_sdk::genesis_block::GenesisBlock;