blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove instruction index parameter

This commit is contained in:
Greg Fitzgerald 2018-11-23 15:34:51 -07:00
parent b3af930153
commit f827bfd83f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bank.rs
View File

@ -822,8 +822,8 @@ impl Bank {
system_program::process_instruction(&tx, instruction_index, program_accounts) system_program::process_instruction(&tx, instruction_index, program_accounts)
{ {
let err = match err { let err = match err {
system_program::Error::ResultWithNegativeTokens(i) => { system_program::Error::ResultWithNegativeTokens => {
BankError::ResultWithNegativeTokens(i) BankError::ResultWithNegativeTokens(instruction_index as u8)
} }
_ => BankError::ProgramRuntimeError(instruction_index as u8), _ => BankError::ProgramRuntimeError(instruction_index as u8),
}; };

6
src/system_program.rs
View File

@ -12,7 +12,7 @@ pub enum Error {
InvalidArgument, InvalidArgument,
AssignOfUnownedAccount, AssignOfUnownedAccount,
AccountNotFinalized, AccountNotFinalized,
ResultWithNegativeTokens(u8), ResultWithNegativeTokens,
} }
impl std::fmt::Display for Error { impl std::fmt::Display for Error {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
@ -60,7 +60,7 @@ pub fn process_instruction(
} }
if tokens > accounts[0].tokens { if tokens > accounts[0].tokens {
info!("Insufficient tokens in account[0]"); info!("Insufficient tokens in account[0]");
Err(Error::ResultWithNegativeTokens(pix as u8))?; Err(Error::ResultWithNegativeTokens)?;
} }
accounts[0].tokens -= tokens; accounts[0].tokens -= tokens;
accounts[1].tokens += tokens; accounts[1].tokens += tokens;
@ -79,7 +79,7 @@ pub fn process_instruction(
//bank should be verifying correctness //bank should be verifying correctness
if tokens > accounts[0].tokens { if tokens > accounts[0].tokens {
info!("Insufficient tokens in account[0]"); info!("Insufficient tokens in account[0]");
Err(Error::ResultWithNegativeTokens(pix as u8))?; Err(Error::ResultWithNegativeTokens)?;
} }
accounts[0].tokens -= tokens; accounts[0].tokens -= tokens;
accounts[1].tokens += tokens; accounts[1].tokens += tokens;