🚀 Add program id tied to each generated instruction

CHANGELOG.md

@@ -10,6 +10,10 @@ incremented upon a breaking change and the patch version will be incremented for
 
 ## [dev] - Unreleased
 
+**Added**
+
+- impr/ added get_program_id function to the IxOps and FuzzTestExecutor ([199](https://github.com/Ackee-Blockchain/trident/pull/199))
+
 **Changed**
 
 - feat/ option to add account into Fuzz Test environment with base64 data ([197](https://github.com/Ackee-Blockchain/trident/pull/197))

crates/client/src/source_code_generators/fuzz_instructions_generator.rs

@@ -208,7 +208,9 @@ fn get_instruction_ixops(
                     type IxData = #module_name::instruction::#instruction_ident_name;
                     type IxAccounts = FuzzAccounts;
                     type IxSnapshot = #ix_snapshot<'info>;
-
+                    fn get_program_id(&self) -> solana_sdk::pubkey::Pubkey {
+                        #module_name::ID
+                    }
                     fn get_data(
                         &self,
                         _client: &mut impl FuzzClient,

crates/client/src/source_code_generators/test_fuzz_generator.rs

@@ -23,20 +23,6 @@ pub fn generate_source_code(idl_instructions: &[Idl]) -> String {
         ),
     };
 
-    let run_with_runtime: syn::Stmt = match fuzz_instructions.len() {
-        1 => {
-            let program_name_upper = idl_instructions[0].metadata.name.to_case(Case::UpperSnake);
-            let program_id_name_ident = format_ident!("PROGRAM_ID_{}", program_name_upper);
-
-            parse_quote!(
-                let _ = fuzz_data.run_with_runtime(#program_id_name_ident, &mut client);
-            )
-        }
-        _ => parse_quote!(
-            let _ = fuzz_data.run_with_runtime(todo!(), &mut client);
-        ),
-    };
-
     let test_fuzz_definition: syn::File = parse_quote! {
         use trident_client::fuzzing::*;
         mod fuzz_instructions;
@@ -60,8 +46,7 @@ pub fn generate_source_code(idl_instructions: &[Idl]) -> String {
 
             let mut client = ProgramTestClientBlocking::new(&#programs_array,&[]).unwrap();
 
-            #run_with_runtime
-
+            let _ = fuzz_data.run_with_runtime(&mut client);
 
         }
 

crates/client/tests/expected_source_codes/expected_fuzz_instructions.rs

@@ -54,6 +54,9 @@ pub mod dummy_example_fuzz_instructions {
         type IxData = dummy_example::instruction::InitializeIx;
         type IxAccounts = FuzzAccounts;
         type IxSnapshot = InitializeIxSnapshot<'info>;
+        fn get_program_id(&self) -> solana_sdk::pubkey::Pubkey {
+            dummy_example::ID
+        }
         fn get_data(
             &self,
             _client: &mut impl FuzzClient,

crates/client/tests/expected_source_codes/expected_test_fuzz.rs

@@ -25,7 +25,7 @@ fn fuzz_iteration<T: FuzzTestExecutor<U> + std::fmt::Display, U>(fuzz_data: Fuzz
 
     let mut client = ProgramTestClientBlocking::new(&[fuzzing_program_dummy_example], &[]).unwrap();
 
-    let _ = fuzz_data.run_with_runtime(PROGRAM_ID_DUMMY_EXAMPLE, &mut client);
+    let _ = fuzz_data.run_with_runtime(&mut client);
 }
 
 fn main() {

crates/fuzz/derive/fuzz_test_executor/src/lib.rs

@@ -13,6 +13,8 @@ pub fn fuzz_test_executor(input: TokenStream) -> TokenStream {
                 let variant_name = &variant.ident;
                 quote! {
                     #enum_name::#variant_name (ix) => {
+                        let program_id = ix.get_program_id();
+
                         let (mut signers, metas) = ix.get_accounts(client, &mut accounts.borrow_mut())
                             .map_err(|e| e.with_origin(Origin::Instruction(self.to_context_string())))
                             .expect("Accounts calculation expect");
@@ -99,7 +101,6 @@ pub fn fuzz_test_executor(input: TokenStream) -> TokenStream {
                impl FuzzTestExecutor<FuzzAccounts> for FuzzInstruction {
                    fn run_fuzzer(
                        &self,
-                       program_id: Pubkey,
                        accounts: &RefCell<FuzzAccounts>,
                        client: &mut impl FuzzClient,
                        sent_txs: &mut HashMap<Hash, ()>,

crates/fuzz/src/fuzz_data.rs

@@ -6,7 +6,6 @@ use arbitrary::Arbitrary;
 use arbitrary::Unstructured;
 use solana_sdk::account::Account;
 use solana_sdk::instruction::AccountMeta;
-use solana_sdk::pubkey::Pubkey;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::error::Error;
@@ -56,7 +55,6 @@ where
 {
     pub fn run_with_runtime(
         &self,
-        program_id: Pubkey,
         client: &mut impl FuzzClient,
     ) -> core::result::Result<(), Box<dyn Error + 'static>> {
         // solana_logger::setup_with_default("off");
@@ -85,7 +83,7 @@ where
             eprintln!("\x1b[34mCurrently processing\x1b[0m: {}", fuzz_ix);
 
             if fuzz_ix
-                .run_fuzzer(program_id, &self.accounts, client, &mut sent_txs)
+                .run_fuzzer(&self.accounts, client, &mut sent_txs)
                 .is_err()
             {
                 // for now skip following instructions in case of error and move to the next fuzz iteration

crates/fuzz/src/fuzz_test_executor.rs

@@ -2,8 +2,6 @@
 
 use anchor_lang::solana_program::hash::Hash;
 
-use solana_sdk::pubkey::Pubkey;
-
 use std::cell::RefCell;
 use std::collections::HashMap;
 
@@ -13,7 +11,6 @@ use crate::fuzz_client::FuzzClient;
 pub trait FuzzTestExecutor<T> {
     fn run_fuzzer(
         &self,
-        program_id: Pubkey,
         accounts: &RefCell<T>,
         client: &mut impl FuzzClient,
         sent_txs: &mut HashMap<Hash, ()>,

crates/fuzz/src/ix_ops.rs

@@ -16,6 +16,10 @@ pub trait IxOps<'info> {
     /// The structure to which the instruction accounts will be deserialized
     type IxSnapshot;
 
+    /// Specify Program ID to which the Instruction corresponds. This is particularly helpful when using multiple
+    /// programs in the workspace, to differentiate between possible program calls.
+    fn get_program_id(&self) -> solana_sdk::pubkey::Pubkey;
+
     /// Provides instruction data for the fuzzed instruction.
     /// It is assumed that the instruction data will be based on the fuzzer input stored in the `self.data` variable.
     /// However it is on the developer to decide and it can be also for example a hardcoded constant.