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

Move entrypoint boilerplate into a macro

This commit is contained in:
Greg Fitzgerald 2019-03-21 14:36:25 -06:00
parent 412ebfcaf2
commit 4bb88619fd
3 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
programs/budget/src/lib.rs
View File

@ -1,22 +1,5 @@
mod budget_processor; mod budget_processor;
use crate::budget_processor::process_instruction; use crate::budget_processor::process_instruction;
use log::*;
use solana_sdk::account::KeyedAccount;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::solana_entrypoint;
use solana_sdk::transaction::InstructionError;
solana_entrypoint!(entrypoint); solana_sdk::process_instruction_entrypoint!(process_instruction);
fn entrypoint(
program_id: &Pubkey,
keyed_accounts: &mut [KeyedAccount],
data: &[u8],
tick_height: u64,
) -> Result<(), InstructionError> {
solana_logger::setup();
trace!("process_instruction: {:?}", data);
trace!("keyed_accounts: {:?}", keyed_accounts);
process_instruction(program_id, keyed_accounts, data, tick_height)
}

16
programs/config/src/lib.rs
View File

@ -3,9 +3,9 @@
use log::*; use log::*;
use solana_sdk::account::KeyedAccount; use solana_sdk::account::KeyedAccount;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
use solana_sdk::solana_entrypoint;
use solana_sdk::transaction::InstructionError; use solana_sdk::transaction::InstructionError;
solana_sdk::process_instruction_entrypoint!(process_instruction);
fn process_instruction( fn process_instruction(
_program_id: &Pubkey, _program_id: &Pubkey,
keyed_accounts: &mut [KeyedAccount], keyed_accounts: &mut [KeyedAccount],
@ -26,20 +26,6 @@ fn process_instruction(
Ok(()) Ok(())
} }
solana_entrypoint!(entrypoint);
fn entrypoint(
program_id: &Pubkey,
keyed_accounts: &mut [KeyedAccount],
data: &[u8],
tick_height: u64,
) -> Result<(), InstructionError> {
solana_logger::setup();
trace!("process_instruction: {:?}", data);
trace!("keyed_accounts: {:?}", keyed_accounts);
process_instruction(program_id, keyed_accounts, data, tick_height)
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

26
sdk/src/native_program.rs
View File

@ -20,12 +20,32 @@ macro_rules! solana_entrypoint(
($entrypoint:ident) => ( ($entrypoint:ident) => (
#[no_mangle] #[no_mangle]
pub extern "C" fn process( pub extern "C" fn process(
program_id: &Pubkey, program_id: &solana_sdk::pubkey::Pubkey,
keyed_accounts: &mut [KeyedAccount], keyed_accounts: &mut [solana_sdk::account::KeyedAccount],
data: &[u8], data: &[u8],
tick_height: u64 tick_height: u64
) -> Result<(), InstructionError> { ) -> Result<(), solana_sdk::transaction::InstructionError> {
$entrypoint(program_id, keyed_accounts, data, tick_height) $entrypoint(program_id, keyed_accounts, data, tick_height)
} }
) )
); );
// Macro to define an entrypoint from a native `process_instruction` function.
#[macro_export]
macro_rules! process_instruction_entrypoint(
($process_instruction:ident) => (
solana_sdk::solana_entrypoint!(process_instruction_entrypoint);
fn process_instruction_entrypoint(
program_id: &solana_sdk::pubkey::Pubkey,
keyed_accounts: &mut [solana_sdk::account::KeyedAccount],
data: &[u8],
tick_height: u64,
) -> Result<(), solana_sdk::transaction::InstructionError> {
solana_logger::setup();
log::trace!("process_instruction: {:?}", data);
log::trace!("keyed_accounts: {:?}", keyed_accounts);
$process_instruction(program_id, keyed_accounts, data, tick_height)
}
)
);