diff --git a/programs/budget_program/src/lib.rs b/programs/budget_program/src/lib.rs index dee532b62e..562620570f 100644 --- a/programs/budget_program/src/lib.rs +++ b/programs/budget_program/src/lib.rs @@ -1,3 +1,3 @@ use solana_budget_api::budget_processor::process_instruction; -solana_sdk::process_instruction_entrypoint!(process_instruction); +solana_sdk::solana_entrypoint!(process_instruction); diff --git a/programs/config_program/src/lib.rs b/programs/config_program/src/lib.rs index 4af3e790e1..a94f7c1fb8 100644 --- a/programs/config_program/src/lib.rs +++ b/programs/config_program/src/lib.rs @@ -1,3 +1,3 @@ use solana_config_api::config_processor::process_instruction; -solana_sdk::process_instruction_entrypoint!(process_instruction); +solana_sdk::solana_entrypoint!(process_instruction); diff --git a/programs/exchange_program/src/lib.rs b/programs/exchange_program/src/lib.rs index 47e6d44ffe..b0227b11e6 100644 --- a/programs/exchange_program/src/lib.rs +++ b/programs/exchange_program/src/lib.rs @@ -1,3 +1,3 @@ use solana_exchange_api::exchange_processor::process_instruction; -solana_sdk::process_instruction_entrypoint!(process_instruction); +solana_sdk::solana_entrypoint!(process_instruction); diff --git a/programs/storage_program/src/lib.rs b/programs/storage_program/src/lib.rs index c0b0b4b905..cfa19b82f5 100644 --- a/programs/storage_program/src/lib.rs +++ b/programs/storage_program/src/lib.rs @@ -1,3 +1,3 @@ use solana_storage_api::storage_processor::process_instruction; -solana_sdk::process_instruction_entrypoint!(process_instruction); +solana_sdk::solana_entrypoint!(process_instruction); diff --git a/programs/token_program/src/lib.rs b/programs/token_program/src/lib.rs index 73e05822a1..0139f55d0d 100644 --- a/programs/token_program/src/lib.rs +++ b/programs/token_program/src/lib.rs @@ -1,3 +1,3 @@ use solana_token_api::token_processor::process_instruction; -solana_sdk::process_instruction_entrypoint!(process_instruction); +solana_sdk::solana_entrypoint!(process_instruction); diff --git a/programs/vote_program/src/lib.rs b/programs/vote_program/src/lib.rs index ffc494db4d..5f53d953a9 100644 --- a/programs/vote_program/src/lib.rs +++ b/programs/vote_program/src/lib.rs @@ -1,3 +1,3 @@ use solana_vote_api::vote_processor::process_instruction; -solana_sdk::process_instruction_entrypoint!(process_instruction); +solana_sdk::solana_entrypoint!(process_instruction); diff --git a/sdk/src/native_program.rs b/sdk/src/native_program.rs index 88fcb4f26b..363e380874 100644 --- a/sdk/src/native_program.rs +++ b/sdk/src/native_program.rs @@ -29,23 +29,3 @@ macro_rules! solana_entrypoint( } ) ); - -// 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::instruction::InstructionError> { - solana_logger::setup(); - - log::trace!("process_instruction: {:?}", data); - log::trace!("keyed_accounts: {:?}", keyed_accounts); - $process_instruction(program_id, keyed_accounts, data, tick_height) - } - ) -);