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

Move Instruction into its own module

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-23 21:12:27 -06:00
committed by Grimes
parent 68c35bfde6
commit acedf4ca5a
32 changed files with 202 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/src/native_program.rs
View File

@@ -1,6 +1,6 @@
use crate::account::KeyedAccount;
use crate::instruction::InstructionError;
use crate::pubkey::Pubkey;
use crate::transaction::InstructionError;
// All native programs export a symbol named process()
pub const ENTRYPOINT: &str = "process";
@@ -24,7 +24,7 @@ macro_rules! solana_entrypoint(
keyed_accounts: &mut [solana_sdk::account::KeyedAccount],
data: &[u8],
tick_height: u64
) -> Result<(), solana_sdk::transaction::InstructionError> {
) -> Result<(), solana_sdk::instruction::InstructionError> {
$entrypoint(program_id, keyed_accounts, data, tick_height)
}
)
@@ -40,7 +40,7 @@ macro_rules! process_instruction_entrypoint(
keyed_accounts: &mut [solana_sdk::account::KeyedAccount],
data: &[u8],
tick_height: u64,
) -> Result<(), solana_sdk::transaction::InstructionError> {
) -> Result<(), solana_sdk::instruction::InstructionError> {
solana_logger::setup();
log::trace!("process_instruction: {:?}", data);