From 713a14f53bf871a536ebe789e4768247d5aa548c Mon Sep 17 00:00:00 2001 From: Joe C Date: Wed, 8 Nov 2023 20:36:07 +0000 Subject: [PATCH] rustfmt: use entrypoint full path This PR swaps any calls to the `entrypoint!` macro with the full path, ie: `solana_program::entrypoint!`. This will play a role in the effort to introduce a linting standard to SPL. --- account-compression/programs/noop/src/lib.rs | 5 +---- associated-token-account/program/src/entrypoint.rs | 6 ++---- binary-option/program/src/entrypoint.rs | 6 ++---- binary-oracle-pair/program/src/entrypoint.rs | 6 +++--- examples/rust/cross-program-invocation/src/entrypoint.rs | 6 ++---- examples/rust/custom-heap/src/entrypoint.rs | 3 +-- examples/rust/logging/src/entrypoint.rs | 6 ++---- examples/rust/sysvar/src/entrypoint.rs | 6 ++---- examples/rust/transfer-lamports/src/entrypoint.rs | 6 ++---- examples/rust/transfer-tokens/src/entrypoint.rs | 6 ++---- feature-gate/program/src/entrypoint.rs | 6 ++---- feature-proposal/program/src/entrypoint.rs | 6 ++---- governance/addin-mock/program/src/entrypoint.rs | 6 +++--- governance/chat/program/src/entrypoint.rs | 6 +++--- governance/program/src/entrypoint.rs | 6 +++--- instruction-padding/program/src/entrypoint.rs | 6 ++---- libraries/math/src/entrypoint.rs | 6 ++---- memo/program/src/entrypoint.rs | 6 ++---- name-service/program/src/entrypoint.rs | 6 +++--- record/program/src/entrypoint.rs | 6 ++---- single-pool/program/src/entrypoint.rs | 6 +++--- stake-pool/program/src/entrypoint.rs | 6 +++--- stateless-asks/program/src/entrypoint.rs | 6 ++---- token-collection/program/src/entrypoint.rs | 6 +++--- token-group/example/src/entrypoint.rs | 6 +++--- token-lending/flash_loan_receiver/src/entrypoint.rs | 6 ++---- token-lending/program/src/entrypoint.rs | 6 +++--- token-lending/program/tests/helpers/flash_loan_receiver.rs | 6 ++---- token-metadata/example/src/entrypoint.rs | 6 +++--- token-swap/program/src/entrypoint.rs | 6 +++--- token-upgrade/program/src/entrypoint.rs | 6 ++---- token-wrap/program/src/entrypoint.rs | 6 ++---- token/program-2022/src/entrypoint.rs | 6 +++--- token/program/src/entrypoint.rs | 6 +++--- token/transfer-hook/example/src/entrypoint.rs | 6 +++--- 35 files changed, 83 insertions(+), 123 deletions(-) diff --git a/account-compression/programs/noop/src/lib.rs b/account-compression/programs/noop/src/lib.rs index 3b71da23ed7..da30b630dae 100644 --- a/account-compression/programs/noop/src/lib.rs +++ b/account-compression/programs/noop/src/lib.rs @@ -6,10 +6,7 @@ use solana_program::{ declare_id!("noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV"); #[cfg(not(feature = "no-entrypoint"))] -use solana_program::entrypoint; - -#[cfg(not(feature = "no-entrypoint"))] -entrypoint!(noop); +solana_program::entrypoint!(noop); pub fn noop( _program_id: &Pubkey, diff --git a/associated-token-account/program/src/entrypoint.rs b/associated-token-account/program/src/entrypoint.rs index 82641a41587..8876e45b78b 100644 --- a/associated-token-account/program/src/entrypoint.rs +++ b/associated-token-account/program/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(not(feature = "no-entrypoint"))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/binary-option/program/src/entrypoint.rs b/binary-option/program/src/entrypoint.rs index 3baa990ba0d..57a98a463b8 100644 --- a/binary-option/program/src/entrypoint.rs +++ b/binary-option/program/src/entrypoint.rs @@ -1,12 +1,10 @@ #![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; use crate::processor::Processor; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/binary-oracle-pair/program/src/entrypoint.rs b/binary-oracle-pair/program/src/entrypoint.rs index 381135f4a9b..693aed651b8 100644 --- a/binary-oracle-pair/program/src/entrypoint.rs +++ b/binary-oracle-pair/program/src/entrypoint.rs @@ -4,11 +4,11 @@ use crate::{error::PoolError, processor}; use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/examples/rust/cross-program-invocation/src/entrypoint.rs b/examples/rust/cross-program-invocation/src/entrypoint.rs index 82641a41587..8876e45b78b 100644 --- a/examples/rust/cross-program-invocation/src/entrypoint.rs +++ b/examples/rust/cross-program-invocation/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(not(feature = "no-entrypoint"))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/examples/rust/custom-heap/src/entrypoint.rs b/examples/rust/custom-heap/src/entrypoint.rs index 8955e6f93bf..9f398acc114 100644 --- a/examples/rust/custom-heap/src/entrypoint.rs +++ b/examples/rust/custom-heap/src/entrypoint.rs @@ -4,7 +4,6 @@ use solana_program::{ account_info::AccountInfo, - entrypoint, entrypoint::{ProgramResult, HEAP_LENGTH, HEAP_START_ADDRESS}, pubkey::Pubkey, }; @@ -44,7 +43,7 @@ unsafe impl std::alloc::GlobalAlloc for BumpAllocator { #[global_allocator] static A: BumpAllocator = BumpAllocator; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/examples/rust/logging/src/entrypoint.rs b/examples/rust/logging/src/entrypoint.rs index 82641a41587..8876e45b78b 100644 --- a/examples/rust/logging/src/entrypoint.rs +++ b/examples/rust/logging/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(not(feature = "no-entrypoint"))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/examples/rust/sysvar/src/entrypoint.rs b/examples/rust/sysvar/src/entrypoint.rs index 82641a41587..8876e45b78b 100644 --- a/examples/rust/sysvar/src/entrypoint.rs +++ b/examples/rust/sysvar/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(not(feature = "no-entrypoint"))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/examples/rust/transfer-lamports/src/entrypoint.rs b/examples/rust/transfer-lamports/src/entrypoint.rs index 82641a41587..8876e45b78b 100644 --- a/examples/rust/transfer-lamports/src/entrypoint.rs +++ b/examples/rust/transfer-lamports/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(not(feature = "no-entrypoint"))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/examples/rust/transfer-tokens/src/entrypoint.rs b/examples/rust/transfer-tokens/src/entrypoint.rs index 82641a41587..8876e45b78b 100644 --- a/examples/rust/transfer-tokens/src/entrypoint.rs +++ b/examples/rust/transfer-tokens/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(not(feature = "no-entrypoint"))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/feature-gate/program/src/entrypoint.rs b/feature-gate/program/src/entrypoint.rs index c261a918a42..d3a0113d746 100644 --- a/feature-gate/program/src/entrypoint.rs +++ b/feature-gate/program/src/entrypoint.rs @@ -2,12 +2,10 @@ use { crate::processor, - solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, - }, + solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/feature-proposal/program/src/entrypoint.rs b/feature-proposal/program/src/entrypoint.rs index e2382fbe4e8..62a02f2a465 100644 --- a/feature-proposal/program/src/entrypoint.rs +++ b/feature-proposal/program/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/governance/addin-mock/program/src/entrypoint.rs b/governance/addin-mock/program/src/entrypoint.rs index af9e723dfd1..befeaa5c0a4 100644 --- a/governance/addin-mock/program/src/entrypoint.rs +++ b/governance/addin-mock/program/src/entrypoint.rs @@ -3,11 +3,11 @@ use crate::{error::VoterWeightAddinError, processor}; use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/governance/chat/program/src/entrypoint.rs b/governance/chat/program/src/entrypoint.rs index 92e0859237e..5dea31c8df6 100644 --- a/governance/chat/program/src/entrypoint.rs +++ b/governance/chat/program/src/entrypoint.rs @@ -3,11 +3,11 @@ use crate::{error::GovernanceChatError, processor}; use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/governance/program/src/entrypoint.rs b/governance/program/src/entrypoint.rs index 26c75d468a8..5836ca26ddf 100644 --- a/governance/program/src/entrypoint.rs +++ b/governance/program/src/entrypoint.rs @@ -3,11 +3,11 @@ use crate::{error::GovernanceError, processor}; use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/instruction-padding/program/src/entrypoint.rs b/instruction-padding/program/src/entrypoint.rs index dd0b353e29b..bb9a931af22 100644 --- a/instruction-padding/program/src/entrypoint.rs +++ b/instruction-padding/program/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(not(feature = "no-entrypoint"))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/libraries/math/src/entrypoint.rs b/libraries/math/src/entrypoint.rs index 82641a41587..8876e45b78b 100644 --- a/libraries/math/src/entrypoint.rs +++ b/libraries/math/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(not(feature = "no-entrypoint"))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/memo/program/src/entrypoint.rs b/memo/program/src/entrypoint.rs index 82641a41587..8876e45b78b 100644 --- a/memo/program/src/entrypoint.rs +++ b/memo/program/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(not(feature = "no-entrypoint"))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/name-service/program/src/entrypoint.rs b/name-service/program/src/entrypoint.rs index 1e70cd1ce17..5f4bac3bbe0 100644 --- a/name-service/program/src/entrypoint.rs +++ b/name-service/program/src/entrypoint.rs @@ -3,12 +3,12 @@ use { crate::processor::Processor, num_traits::FromPrimitive, solana_program::{ - account_info::AccountInfo, decode_error::DecodeError, entrypoint, - entrypoint::ProgramResult, msg, program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, decode_error::DecodeError, entrypoint::ProgramResult, msg, + program_error::PrintProgramError, pubkey::Pubkey, }, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); pub fn process_instruction( program_id: &Pubkey, diff --git a/record/program/src/entrypoint.rs b/record/program/src/entrypoint.rs index e2382fbe4e8..62a02f2a465 100644 --- a/record/program/src/entrypoint.rs +++ b/record/program/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/single-pool/program/src/entrypoint.rs b/single-pool/program/src/entrypoint.rs index 518892fd1e0..68d598e5d8a 100644 --- a/single-pool/program/src/entrypoint.rs +++ b/single-pool/program/src/entrypoint.rs @@ -5,12 +5,12 @@ use { crate::{error::SinglePoolError, processor::Processor}, solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/stake-pool/program/src/entrypoint.rs b/stake-pool/program/src/entrypoint.rs index a809d7f226e..92e3ea5ad57 100644 --- a/stake-pool/program/src/entrypoint.rs +++ b/stake-pool/program/src/entrypoint.rs @@ -5,12 +5,12 @@ use { crate::{error::StakePoolError, processor::Processor}, solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/stateless-asks/program/src/entrypoint.rs b/stateless-asks/program/src/entrypoint.rs index 3baa990ba0d..57a98a463b8 100644 --- a/stateless-asks/program/src/entrypoint.rs +++ b/stateless-asks/program/src/entrypoint.rs @@ -1,12 +1,10 @@ #![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; use crate::processor::Processor; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token-collection/program/src/entrypoint.rs b/token-collection/program/src/entrypoint.rs index 762ec75255a..0336a5f1c99 100644 --- a/token-collection/program/src/entrypoint.rs +++ b/token-collection/program/src/entrypoint.rs @@ -3,13 +3,13 @@ use { crate::processor, solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }, spl_token_group_interface::error::TokenGroupError, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token-group/example/src/entrypoint.rs b/token-group/example/src/entrypoint.rs index 762ec75255a..0336a5f1c99 100644 --- a/token-group/example/src/entrypoint.rs +++ b/token-group/example/src/entrypoint.rs @@ -3,13 +3,13 @@ use { crate::processor, solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }, spl_token_group_interface::error::TokenGroupError, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token-lending/flash_loan_receiver/src/entrypoint.rs b/token-lending/flash_loan_receiver/src/entrypoint.rs index 633133e1941..55b8b4c2eb7 100644 --- a/token-lending/flash_loan_receiver/src/entrypoint.rs +++ b/token-lending/flash_loan_receiver/src/entrypoint.rs @@ -1,8 +1,6 @@ -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token-lending/program/src/entrypoint.rs b/token-lending/program/src/entrypoint.rs index a1d68d8fa12..beba09dfad8 100644 --- a/token-lending/program/src/entrypoint.rs +++ b/token-lending/program/src/entrypoint.rs @@ -4,11 +4,11 @@ use crate::{error::LendingError, processor}; use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token-lending/program/tests/helpers/flash_loan_receiver.rs b/token-lending/program/tests/helpers/flash_loan_receiver.rs index 21d8c615ab9..b5aa7ae57e8 100644 --- a/token-lending/program/tests/helpers/flash_loan_receiver.rs +++ b/token-lending/program/tests/helpers/flash_loan_receiver.rs @@ -1,6 +1,4 @@ -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, msg, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, msg, pubkey::Pubkey}; use crate::helpers::flash_loan_receiver::FlashLoanReceiverError::InvalidInstruction; use spl_token::{ @@ -29,7 +27,7 @@ pub enum FlashLoanReceiverInstruction { }, } -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); pub fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token-metadata/example/src/entrypoint.rs b/token-metadata/example/src/entrypoint.rs index 9104ee3fe7c..accd30f2c17 100644 --- a/token-metadata/example/src/entrypoint.rs +++ b/token-metadata/example/src/entrypoint.rs @@ -3,13 +3,13 @@ use { crate::processor, solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }, spl_token_metadata_interface::error::TokenMetadataError, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token-swap/program/src/entrypoint.rs b/token-swap/program/src/entrypoint.rs index b41aa6fc3f1..206f51456d7 100644 --- a/token-swap/program/src/entrypoint.rs +++ b/token-swap/program/src/entrypoint.rs @@ -2,11 +2,11 @@ use crate::{error::SwapError, processor::Processor}; use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token-upgrade/program/src/entrypoint.rs b/token-upgrade/program/src/entrypoint.rs index dd0b353e29b..bb9a931af22 100644 --- a/token-upgrade/program/src/entrypoint.rs +++ b/token-upgrade/program/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(not(feature = "no-entrypoint"))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token-wrap/program/src/entrypoint.rs b/token-wrap/program/src/entrypoint.rs index e2382fbe4e8..62a02f2a465 100644 --- a/token-wrap/program/src/entrypoint.rs +++ b/token-wrap/program/src/entrypoint.rs @@ -2,11 +2,9 @@ #![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))] -use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey, -}; +use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token/program-2022/src/entrypoint.rs b/token/program-2022/src/entrypoint.rs index 1e534c5eda9..366ee78d012 100644 --- a/token/program-2022/src/entrypoint.rs +++ b/token/program-2022/src/entrypoint.rs @@ -3,12 +3,12 @@ use { crate::{error::TokenError, processor::Processor}, solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token/program/src/entrypoint.rs b/token/program/src/entrypoint.rs index 53315751b9a..6d9ad5dab3e 100644 --- a/token/program/src/entrypoint.rs +++ b/token/program/src/entrypoint.rs @@ -2,11 +2,11 @@ use crate::{error::TokenError, processor::Processor}; use solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/token/transfer-hook/example/src/entrypoint.rs b/token/transfer-hook/example/src/entrypoint.rs index 14a2bc5b11e..b2046037275 100644 --- a/token/transfer-hook/example/src/entrypoint.rs +++ b/token/transfer-hook/example/src/entrypoint.rs @@ -3,13 +3,13 @@ use { crate::processor, solana_program::{ - account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, - program_error::PrintProgramError, pubkey::Pubkey, + account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError, + pubkey::Pubkey, }, spl_transfer_hook_interface::error::TransferHookError, }; -entrypoint!(process_instruction); +solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo],