Extract new processor macro

src/lib.rs

@@ -7,17 +7,26 @@ pub use solana_program_test::tokio;
 pub use solana_program_test::*;
 
 #[macro_export]
-macro_rules! processor {
-    ($process_instruction:expr) => {
-        Some(
-            |first_instruction_account: usize,
-             invoke_context: &mut solana_program_test::InvokeContext| {
-                $crate::builtin_process_instruction(
-                    $process_instruction,
-                    first_instruction_account,
-                    invoke_context,
-                )
-            },
-        )
+macro_rules! correct_entry {
+    ($entry:path) => {
+        fn correct_entry(
+            program_id: &solana_program::pubkey::Pubkey,
+            accounts: &[solana_program::account_info::AccountInfo],
+            data: &[u8],
+        ) -> solana_program::entrypoint::ProgramResult {
+            $entry(
+                program_id,
+                unsafe { &*(accounts as *const [solana_program::account_info::AccountInfo]) },
+                data,
+            )
+        }
     };
 }
+
+#[macro_export]
+macro_rules! processor {
+    ($entry:path) => {{
+        correct_entry!($entry);
+        solana_program_test::processor!(correct_entry)
+    }};
+}

tests/testsuite/helpers.rs

@@ -6,24 +6,14 @@ use solana_sdk::{
     signature::{Keypair, Signer},
 };
 
-use solana_program::account_info::AccountInfo;
-use solana_program::entrypoint::ProgramResult;
 use std::str::FromStr;
 
-pub fn correct_entry(program_id: &Pubkey, accounts: &[AccountInfo], data: &[u8]) -> ProgramResult {
-    program_for_tests::entry(
-        program_id,
-        unsafe { &*(accounts as *const [AccountInfo]) },
-        data,
-    )
-}
-
 pub fn add_program() -> (ProgramTest, Pubkey) {
     let program_id = Pubkey::from_str("CwrqeMj2U8tFr1Rhkgwc84tpAsqbt9pTt2a4taoTADPr").unwrap();
     let program = ProgramTest::new(
         "program_for_tests",
         program_id,
-        solana_program_test::processor!(correct_entry),
+        processor!(program_for_tests::entry),
     );
 
     (program, program_id)

tests/testsuite/program_test_context.rs

@@ -4,7 +4,6 @@ use solana_sdk::{pubkey::Pubkey, sysvar::clock::Clock};
 
 use std::str::FromStr;
 
-use crate::helpers::correct_entry;
 #[cfg(feature = "pyth")]
 use pyth_sdk_solana::state::{PriceInfo, PriceStatus, SolanaPriceAccount};
 
@@ -14,7 +13,7 @@ async fn transaction_from_instructions() {
     let program = ProgramTest::new(
         "program_for_tests",
         program_id,
-        solana_program_test::processor!(correct_entry),
+        processor!(program_for_tests::entry),
     );
 
     let mut program_context = program.start_with_context().await;