🎨 Set File feature as default instead of macro

crates/cli/src/command/fuzz.rs

@@ -30,7 +30,7 @@ pub enum FuzzCommand {
     },
     /// Add new fuzz test. Explicit fuzz test name is not yet supported. Implicit name is fuzz_ID, where ID is automatically derived.
     Add {
-        #[clap(default_value = "macro")]
+        #[clap(default_value = "file")]
         snapshots_type: SnapshotsType,
     },
 }

crates/cli/src/lib.rs

@@ -51,7 +51,7 @@ enum Command {
         #[clap(default_value = "fuzz")]
         tests_type: TestsType,
         /// Specifies type of Accounts Snapshots, i.e used derive macro or generated file
-        #[clap(default_value = "macro")]
+        #[clap(default_value = "file")]
         snapshots_type: SnapshotsType,
     },
     /// Removes target contents except for KeyPair and removes hfuzz_target folder

crates/client/src/source_code_generators/fuzzer_generator.rs

@@ -214,7 +214,7 @@ pub fn generate_source_code(programs_data: &[ProgramData]) -> String {
             let fuzzer_module: syn::ItemMod = parse_quote! {
                 pub mod #fuzz_instructions_module_name {
                     use trident_client::fuzzing::*;
-                    // use crate::accounts_snapshots::*;
+                    use crate::accounts_snapshots::*;
 
                     #[derive(Arbitrary, DisplayIx, FuzzTestExecutor, FuzzDeserialize)]
                     pub enum FuzzInstruction {

crates/client/src/templates/trident-tests/test_fuzz.rs

@@ -1,9 +1,8 @@
 use trident_client::fuzzing::*;
+mod accounts_snapshots;
 mod fuzz_instructions;
 
-// TODO: In case of using file extension for AccountsSnapshots
-// uncomment the line below
-// mod accounts_snapshots;
+pub type FuzzInstruction = todo!();
 
 struct MyFuzzData;
 

crates/client/tests/test_data/expected_source_codes/expected_fuzz_instructions.rs

@@ -1,4 +1,5 @@
 pub mod fuzz_example3_fuzz_instructions {
+    use crate::accounts_snapshots::*;
     use trident_client::fuzzing::*;
     #[derive(Arbitrary, DisplayIx, FuzzTestExecutor, FuzzDeserialize)]
     pub enum FuzzInstruction {

examples/fuzz-tests/arbitrary-custom-types-4/trident-tests/fuzz_tests/fuzz_0/test_fuzz.rs

@@ -5,27 +5,24 @@ use fuzz_instructions::arbitrary_custom_types_4_fuzz_instructions::FuzzInstructi
 use fuzz_instructions::arbitrary_custom_types_4_fuzz_instructions::Initialize;
 use fuzz_instructions::arbitrary_custom_types_4_fuzz_instructions::Update;
 use trident_client::fuzzing::*;
+mod accounts_snapshots;
 mod fuzz_instructions;
 
-// TODO: In case of using file extension for AccountsSnapshots
-// uncomment the line below
-mod accounts_snapshots;
+pub type FuzzInstruction = FuzzInstruction_arbitrary_custom_types_4;
 
 struct MyFuzzData;
 
-impl FuzzDataBuilder<FuzzInstruction_arbitrary_custom_types_4> for MyFuzzData {
-    fn pre_ixs(
-        u: &mut arbitrary::Unstructured,
-    ) -> arbitrary::Result<Vec<FuzzInstruction_arbitrary_custom_types_4>> {
-        let init = FuzzInstruction_arbitrary_custom_types_4::Initialize(Initialize::arbitrary(u)?);
-        let update = FuzzInstruction_arbitrary_custom_types_4::Update(Update::arbitrary(u)?);
+impl FuzzDataBuilder<FuzzInstruction> for MyFuzzData {
+    fn pre_ixs(u: &mut arbitrary::Unstructured) -> arbitrary::Result<Vec<FuzzInstruction>> {
+        let init = FuzzInstruction::Initialize(Initialize::arbitrary(u)?);
+        let update = FuzzInstruction::Update(Update::arbitrary(u)?);
         Ok(vec![init, update])
     }
 }
 
 fn main() {
     loop {
-        fuzz_trident!(fuzz_ix: FuzzInstruction_arbitrary_custom_types_4, |fuzz_data: MyFuzzData| {
+        fuzz_trident!(fuzz_ix: FuzzInstruction, |fuzz_data: MyFuzzData| {
 
             // Specify programs you want to include in genesis
             // Programs without an `entry_fn`` will be searched for within `trident-genesis` folder.

examples/fuzz-tests/arbitrary-limit-inputs-5/trident-tests/fuzz_tests/fuzz_0/test_fuzz.rs

@@ -6,26 +6,21 @@ use fuzz_instructions::arbitrary_limit_inputs_5_fuzz_instructions::InitVesting;
 use trident_client::fuzzing::*;
 mod fuzz_instructions;
 
-// TODO: In case of using file extension for AccountsSnapshots
-// uncomment the line below
-// mod accounts_snapshots;
-
 struct MyFuzzData;
 
-impl FuzzDataBuilder<FuzzInstruction_arbitrary_limit_inputs_5> for MyFuzzData {
-    fn pre_ixs(
-        u: &mut arbitrary::Unstructured,
-    ) -> arbitrary::Result<Vec<FuzzInstruction_arbitrary_limit_inputs_5>> {
-        let init_ix =
-            FuzzInstruction_arbitrary_limit_inputs_5::InitVesting(InitVesting::arbitrary(u)?);
+pub type FuzzInstruction = FuzzInstruction_arbitrary_limit_inputs_5;
+
+impl FuzzDataBuilder<FuzzInstruction> for MyFuzzData {
+    fn pre_ixs(u: &mut arbitrary::Unstructured) -> arbitrary::Result<Vec<FuzzInstruction>> {
+        let init_ix = FuzzInstruction::InitVesting(InitVesting::arbitrary(u)?);
 
         Ok(vec![init_ix])
     }
 }
 
 fn main() {
     loop {
-        fuzz_trident!(fuzz_ix: FuzzInstruction_arbitrary_limit_inputs_5, |fuzz_data: MyFuzzData| {
+        fuzz_trident!(fuzz_ix: FuzzInstruction, |fuzz_data: MyFuzzData| {
 
             // Specify programs you want to include in genesis
             // Programs without an `entry_fn`` will be searched for within `trident-genesis` folder.

examples/fuzz-tests/cpi-metaplex-7/trident-tests/fuzz_tests/fuzz_0/test_fuzz.rs

@@ -6,34 +6,26 @@ use fuzz_instructions::cpi_metaplex_7_fuzz_instructions::Initialize;
 use trident_client::fuzzing::*;
 mod fuzz_instructions;
 
-// TODO: In case of using file extension for AccountsSnapshots
-// uncomment the line below
-// mod accounts_snapshots;
+pub type FuzzInstruction = FuzzInstruction_cpi_metaplex_7;
 
 struct MyFuzzData;
 
-impl FuzzDataBuilder<FuzzInstruction_cpi_metaplex_7> for MyFuzzData {
-    fn pre_ixs(
-        u: &mut arbitrary::Unstructured,
-    ) -> arbitrary::Result<Vec<FuzzInstruction_cpi_metaplex_7>> {
-        let init = FuzzInstruction_cpi_metaplex_7::Initialize(Initialize::arbitrary(u)?);
+impl FuzzDataBuilder<FuzzInstruction> for MyFuzzData {
+    fn pre_ixs(u: &mut arbitrary::Unstructured) -> arbitrary::Result<Vec<FuzzInstruction>> {
+        let init = FuzzInstruction::Initialize(Initialize::arbitrary(u)?);
         Ok(vec![init])
     }
-    fn ixs(
-        _u: &mut arbitrary::Unstructured,
-    ) -> arbitrary::Result<Vec<FuzzInstruction_cpi_metaplex_7>> {
+    fn ixs(_u: &mut arbitrary::Unstructured) -> arbitrary::Result<Vec<FuzzInstruction>> {
         Ok(vec![])
     }
-    fn post_ixs(
-        _u: &mut arbitrary::Unstructured,
-    ) -> arbitrary::Result<Vec<FuzzInstruction_cpi_metaplex_7>> {
+    fn post_ixs(_u: &mut arbitrary::Unstructured) -> arbitrary::Result<Vec<FuzzInstruction>> {
         Ok(vec![])
     }
 }
 
 fn main() {
     loop {
-        fuzz_trident!(fuzz_ix: FuzzInstruction_cpi_metaplex_7, |fuzz_data: MyFuzzData| {
+        fuzz_trident!(fuzz_ix: FuzzInstruction, |fuzz_data: MyFuzzData| {
 
             // Specify programs you want to include in genesis
             // Programs without an `entry_fn`` will be searched for within `trident-genesis` folder.

examples/fuzz-tests/hello_world/trident-tests/fuzz_tests/fuzz_0/test_fuzz.rs

@@ -4,26 +4,23 @@ use hello_world::ID as PROGRAM_ID_HELLO_WORLD;
 const PROGRAM_NAME_HELLO_WORLD: &str = "hello_world";
 use fuzz_instructions::hello_world_fuzz_instructions::FuzzInstruction as FuzzInstruction_hello_world;
 use trident_client::fuzzing::*;
+mod accounts_snapshots;
 mod fuzz_instructions;
 
-// TODO: In case of using file extension for AccountsSnapshots
-// uncomment the line below
-mod accounts_snapshots;
+pub type FuzzInstruction = FuzzInstruction_hello_world;
 
 struct MyFuzzData;
 
-impl FuzzDataBuilder<FuzzInstruction_hello_world> for MyFuzzData {
-    fn pre_ixs(
-        u: &mut arbitrary::Unstructured,
-    ) -> arbitrary::Result<Vec<FuzzInstruction_hello_world>> {
-        let init = FuzzInstruction_hello_world::Initialize(Initialize::arbitrary(u)?);
+impl FuzzDataBuilder<FuzzInstruction> for MyFuzzData {
+    fn pre_ixs(u: &mut arbitrary::Unstructured) -> arbitrary::Result<Vec<FuzzInstruction>> {
+        let init = FuzzInstruction::Initialize(Initialize::arbitrary(u)?);
         Ok(vec![init])
     }
 }
 
 fn main() {
     loop {
-        fuzz_trident!(fuzz_ix: FuzzInstruction_hello_world, |fuzz_data: MyFuzzData| {
+        fuzz_trident!(fuzz_ix: FuzzInstruction, |fuzz_data: MyFuzzData| {
 
             // Specify programs you want to include in genesis
             // Programs without an `entry_fn`` will be searched for within `trident-genesis` folder.

examples/fuzz-tests/incorrect-integer-arithmetic-3/trident-tests/fuzz_tests/fuzz_0/test_fuzz.rs

@@ -4,28 +4,24 @@ use incorrect_integer_arithmetic_3::ID as PROGRAM_ID_INCORRECT_INTEGER_ARITHMETI
 const PROGRAM_NAME_INCORRECT_INTEGER_ARITHMETIC_3: &str = "incorrect_integer_arithmetic_3";
 use fuzz_instructions::incorrect_integer_arithmetic_3_fuzz_instructions::FuzzInstruction as FuzzInstruction_incorrect_integer_arithmetic_3;
 use trident_client::fuzzing::*;
+mod accounts_snapshots;
 mod fuzz_instructions;
 
-// TODO: In case of using file extension for AccountsSnapshots
-// uncomment the line below
-mod accounts_snapshots;
+pub type FuzzInstruction = FuzzInstruction_incorrect_integer_arithmetic_3;
 
 struct MyFuzzData;
 
-impl FuzzDataBuilder<FuzzInstruction_incorrect_integer_arithmetic_3> for MyFuzzData {
-    fn pre_ixs(
-        u: &mut arbitrary::Unstructured,
-    ) -> arbitrary::Result<Vec<FuzzInstruction_incorrect_integer_arithmetic_3>> {
-        let init_ix =
-            FuzzInstruction_incorrect_integer_arithmetic_3::InitVesting(InitVesting::arbitrary(u)?);
+impl FuzzDataBuilder<FuzzInstruction> for MyFuzzData {
+    fn pre_ixs(u: &mut arbitrary::Unstructured) -> arbitrary::Result<Vec<FuzzInstruction>> {
+        let init_ix = FuzzInstruction::InitVesting(InitVesting::arbitrary(u)?);
 
         Ok(vec![init_ix])
     }
 }
 
 fn main() {
     loop {
-        fuzz_trident!(fuzz_ix: FuzzInstruction_incorrect_integer_arithmetic_3, |fuzz_data: MyFuzzData| {
+        fuzz_trident!(fuzz_ix: FuzzInstruction, |fuzz_data: MyFuzzData| {
 
             // Specify programs you want to include in genesis
             // Programs without an `entry_fn`` will be searched for within `trident-genesis` folder.

examples/fuzz-tests/incorrect-ix-sequence-1/trident-tests/fuzz_tests/fuzz_0/test_fuzz.rs

@@ -4,27 +4,23 @@ use incorrect_ix_sequence_1::ID as PROGRAM_ID_INCORRECT_IX_SEQUENCE_1;
 const PROGRAM_NAME_INCORRECT_IX_SEQUENCE_1: &str = "incorrect_ix_sequence_1";
 use fuzz_instructions::incorrect_ix_sequence_1_fuzz_instructions::FuzzInstruction as FuzzInstruction_incorrect_ix_sequence_1;
 use trident_client::fuzzing::*;
+mod accounts_snapshots;
 mod fuzz_instructions;
 
-// TODO: In case of using file extension for AccountsSnapshots
-// uncomment the line below
-mod accounts_snapshots;
+pub type FuzzInstruction = FuzzInstruction_incorrect_ix_sequence_1;
 
 struct MyFuzzData;
 
-impl FuzzDataBuilder<FuzzInstruction_incorrect_ix_sequence_1> for MyFuzzData {
-    fn pre_ixs(
-        u: &mut arbitrary::Unstructured,
-    ) -> arbitrary::Result<Vec<FuzzInstruction_incorrect_ix_sequence_1>> {
-        let init_ix =
-            FuzzInstruction_incorrect_ix_sequence_1::Initialize(Initialize::arbitrary(u)?);
+impl FuzzDataBuilder<FuzzInstruction> for MyFuzzData {
+    fn pre_ixs(u: &mut arbitrary::Unstructured) -> arbitrary::Result<Vec<FuzzInstruction>> {
+        let init_ix = FuzzInstruction::Initialize(Initialize::arbitrary(u)?);
         Ok(vec![init_ix])
     }
 }
 
 fn main() {
     loop {
-        fuzz_trident!(fuzz_ix: FuzzInstruction_incorrect_ix_sequence_1, |fuzz_data: MyFuzzData| {
+        fuzz_trident!(fuzz_ix: FuzzInstruction, |fuzz_data: MyFuzzData| {
 
             // Specify programs you want to include in genesis
             // Programs without an `entry_fn`` will be searched for within `trident-genesis` folder.

examples/fuzz-tests/simple-cpi-6/Trident.toml

@@ -6,7 +6,7 @@ validator_startup_timeout = 15000
 # Timeout in seconds (default: 10)
 timeout = 10
 # Number of fuzzing iterations (default: 0 [no limit])
-iterations = 100
+iterations = 1000
 # Number of concurrent fuzzing threads (default: 0 [number of CPUs / 2])
 threads = 0
 # Don't close children's stdin, stdout, stderr; can be noisy (default: false)
@@ -38,4 +38,4 @@ save_all = false
 allow_duplicate_txs = false
 # Trident will show statistics after the fuzzing session. This option forces use of honggfuzz parameter
 # `keep_output` as true in order to be able to catch fuzzer stdout. (default: false)
-fuzzing_with_stats = false
+fuzzing_with_stats = true

examples/fuzz-tests/simple-cpi-6/programs/caller/Cargo.toml

@@ -15,10 +15,7 @@ no-entrypoint = []
 no-idl = []
 no-log-ix-name = []
 idl-build = ["anchor-lang/idl-build"]
-trident-fuzzing = ["dep:trident-fuzz"]
 
 [dependencies]
 anchor-lang = "0.30.1"
 callee = { path = "../callee", features = ["cpi"] }
-trident-derive-accounts-snapshots = { path = "../../../../../crates/fuzz/derive/accounts_snapshots" }
-trident-fuzz = { path = "../../../../../crates/fuzz", optional = true }

examples/fuzz-tests/simple-cpi-6/programs/caller/src/lib.rs

@@ -1,6 +1,5 @@
 use anchor_lang::prelude::*;
 use callee::program::Callee;
-use trident_derive_accounts_snapshots::AccountsSnapshots;
 
 declare_id!("FWtSodrkUnovFPnNRCxneP6VWh6JH6jtQZ4PHoP8Ejuz");
 
@@ -22,7 +21,7 @@ pub mod caller {
         Ok(())
     }
 }
-#[derive(AccountsSnapshots, Accounts)]
+#[derive(Accounts)]
 pub struct InitializeCaller<'info> {
     pub signer: Signer<'info>,
     pub program: Program<'info, Callee>,

examples/fuzz-tests/simple-cpi-6/trident-tests/fuzz_tests/Cargo.toml

@@ -21,4 +21,3 @@ path = "../../programs/callee"
 
 [dependencies.caller]
 path = "../../programs/caller"
-features = ["trident-fuzzing"]