Review comments
This commit is contained in:
committed by
Greg Fitzgerald
parent
1a9ef37251
commit
fe1676bc3a
@ -1,11 +1,12 @@
|
||||
mod budget_program;
|
||||
|
||||
use crate::budget_program::process_instruction;
|
||||
use bincode::serialize;
|
||||
use log::*;
|
||||
use solana_sdk::account::KeyedAccount;
|
||||
use solana_sdk::native_program::ProgramError;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use solana_sdk::{custom_error, solana_entrypoint};
|
||||
use solana_sdk::solana_entrypoint;
|
||||
|
||||
solana_entrypoint!(entrypoint);
|
||||
fn entrypoint(
|
||||
@ -19,5 +20,5 @@ fn entrypoint(
|
||||
trace!("process_instruction: {:?}", data);
|
||||
trace!("keyed_accounts: {:?}", keyed_accounts);
|
||||
process_instruction(program_id, keyed_accounts, data)
|
||||
.map_err(|e| ProgramError::CustomError(custom_error!(e)))
|
||||
.map_err(|e| ProgramError::CustomError(serialize(&e).unwrap()))
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
use bincode::serialize;
|
||||
use log::*;
|
||||
use serde_derive::Serialize;
|
||||
use solana_sdk::account::KeyedAccount;
|
||||
use solana_sdk::custom_error;
|
||||
use solana_sdk::native_program::ProgramError;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use solana_sdk::system_instruction::SystemInstruction;
|
||||
@ -101,7 +101,7 @@ pub fn entrypoint(
|
||||
SystemError::ResultWithNegativeLamports => {
|
||||
ProgramError::ResultWithNegativeLamports
|
||||
}
|
||||
e => ProgramError::CustomError(custom_error!(e)),
|
||||
e => ProgramError::CustomError(serialize(&e).unwrap()),
|
||||
}
|
||||
}),
|
||||
SystemInstruction::Assign { program_id } => {
|
||||
|
@ -1,8 +1,9 @@
|
||||
use bincode::serialize;
|
||||
use log::*;
|
||||
use solana_sdk::account::KeyedAccount;
|
||||
use solana_sdk::native_program::ProgramError;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use solana_sdk::{custom_error, solana_entrypoint};
|
||||
use solana_sdk::solana_entrypoint;
|
||||
|
||||
mod token_program;
|
||||
|
||||
@ -15,8 +16,8 @@ fn entrypoint(
|
||||
) -> Result<(), ProgramError> {
|
||||
solana_logger::setup();
|
||||
|
||||
token_program::TokenProgram::process(program_id, info, input).map_err(|err| {
|
||||
error!("error: {:?}", err);
|
||||
ProgramError::CustomError(custom_error!(err))
|
||||
token_program::TokenProgram::process(program_id, info, input).map_err(|e| {
|
||||
error!("error: {:?}", e);
|
||||
ProgramError::CustomError(serialize(&e).unwrap())
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user