diff --git a/memo/program/src/entrypoint.rs b/memo/program/src/entrypoint.rs index fba0c2a8..0852451b 100644 --- a/memo/program/src/entrypoint.rs +++ b/memo/program/src/entrypoint.rs @@ -1,18 +1,17 @@ //! Program entrypoint use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, info, - program_error::ProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, program_error::ProgramError, + pubkey::Pubkey, }; use std::str::from_utf8; entrypoint!(process_instruction); -fn process_instruction<'a>( +fn process_instruction( _program_id: &Pubkey, - _accounts: &'a [AccountInfo<'a>], + _accounts: &[AccountInfo], instruction_data: &[u8], ) -> ProgramResult { - info!("hi"); from_utf8(instruction_data).map_err(|_| ProgramError::InvalidInstructionData)?; Ok(()) } diff --git a/stake-pool/program/src/entrypoint.rs b/stake-pool/program/src/entrypoint.rs index a7afa8c8..b4ee96c2 100644 --- a/stake-pool/program/src/entrypoint.rs +++ b/stake-pool/program/src/entrypoint.rs @@ -7,9 +7,9 @@ use solana_program::{ }; entrypoint!(process_instruction); -fn process_instruction<'a>( +fn process_instruction( program_id: &Pubkey, - accounts: &'a [AccountInfo<'a>], + accounts: &[AccountInfo], instruction_data: &[u8], ) -> ProgramResult { if let Err(error) = Processor::process(program_id, accounts, instruction_data) { diff --git a/themis/program_ristretto/src/entrypoint.rs b/themis/program_ristretto/src/entrypoint.rs index 4d589f36..28857eba 100644 --- a/themis/program_ristretto/src/entrypoint.rs +++ b/themis/program_ristretto/src/entrypoint.rs @@ -5,9 +5,9 @@ use solana_program::{ }; entrypoint!(process_instruction); -fn process_instruction<'a>( +fn process_instruction( program_id: &Pubkey, - accounts: &'a [AccountInfo<'a>], + accounts: &[AccountInfo], instruction_data: &[u8], ) -> ProgramResult { crate::processor::process_instruction(program_id, accounts, instruction_data)?; diff --git a/themis/program_ristretto/src/processor.rs b/themis/program_ristretto/src/processor.rs index 4b8b7808..8b6a1e4a 100644 --- a/themis/program_ristretto/src/processor.rs +++ b/themis/program_ristretto/src/processor.rs @@ -88,9 +88,9 @@ fn process_request_payment( } /// Process the given transaction instruction -pub fn process_instruction<'a>( +pub fn process_instruction( _program_id: &Pubkey, - account_infos: &'a [AccountInfo<'a>], + account_infos: &[AccountInfo], input: &[u8], ) -> Result<(), ProgramError> { let account_infos_iter = &mut account_infos.iter(); diff --git a/token-swap/program/src/entrypoint.rs b/token-swap/program/src/entrypoint.rs index 18fdc640..b41aa6fc 100644 --- a/token-swap/program/src/entrypoint.rs +++ b/token-swap/program/src/entrypoint.rs @@ -7,9 +7,9 @@ use solana_program::{ }; entrypoint!(process_instruction); -fn process_instruction<'a>( +fn process_instruction( program_id: &Pubkey, - accounts: &'a [AccountInfo<'a>], + accounts: &[AccountInfo], instruction_data: &[u8], ) -> ProgramResult { if let Err(error) = Processor::process(program_id, accounts, instruction_data) { diff --git a/token/program-v3/src/entrypoint.rs b/token/program-v3/src/entrypoint.rs index b2555132..53315751 100644 --- a/token/program-v3/src/entrypoint.rs +++ b/token/program-v3/src/entrypoint.rs @@ -7,9 +7,9 @@ use solana_program::{ }; entrypoint!(process_instruction); -fn process_instruction<'a>( +fn process_instruction( program_id: &Pubkey, - accounts: &'a [AccountInfo<'a>], + accounts: &[AccountInfo], instruction_data: &[u8], ) -> ProgramResult { if let Err(error) = Processor::process(program_id, accounts, instruction_data) { diff --git a/token/program/src/entrypoint.rs b/token/program/src/entrypoint.rs index b2555132..53315751 100644 --- a/token/program/src/entrypoint.rs +++ b/token/program/src/entrypoint.rs @@ -7,9 +7,9 @@ use solana_program::{ }; entrypoint!(process_instruction); -fn process_instruction<'a>( +fn process_instruction( program_id: &Pubkey, - accounts: &'a [AccountInfo<'a>], + accounts: &[AccountInfo], instruction_data: &[u8], ) -> ProgramResult { if let Err(error) = Processor::process(program_id, accounts, instruction_data) {