From 79e1c5fbdbb851fe2c2599cfcfad13975407d479 Mon Sep 17 00:00:00 2001 From: Hardhat Chad Date: Fri, 27 Sep 2024 07:25:46 +0000 Subject: [PATCH] cleanup entrypoint --- program/src/lib.rs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/program/src/lib.rs b/program/src/lib.rs index 0bb046f..1523004 100644 --- a/program/src/lib.rs +++ b/program/src/lib.rs @@ -19,27 +19,16 @@ use update::*; use upgrade::*; use ore_api::instruction::*; -use solana_program::{ - self, account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError, - pubkey::Pubkey, -}; - -solana_program::entrypoint!(process_instruction); +use steel::*; pub fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], data: &[u8], ) -> ProgramResult { - if program_id.ne(&ore_api::id()) { - return Err(ProgramError::IncorrectProgramId); - } + let (ix, data) = parse_instruction(&ore_api::ID, program_id, data)?; - let (tag, data) = data - .split_first() - .ok_or(ProgramError::InvalidInstructionData)?; - - match OreInstruction::try_from(*tag).or(Err(ProgramError::InvalidInstructionData))? { + match ix { OreInstruction::Claim => process_claim(accounts, data)?, OreInstruction::Close => process_close(accounts, data)?, OreInstruction::Mine => process_mine(accounts, data)?, @@ -53,3 +42,5 @@ pub fn process_instruction( Ok(()) } + +entrypoint!(process_instruction);