Hoist responsibilities to the fuzzer entrypoint

Author: InKryption

.circleci/config.yml

@@ -221,7 +221,7 @@ jobs:
           at: workspace
       - run:
           name: Run Gossip Service Fuzzer
-          command: workspace/zig-out-release/bin/fuzz gossip_service 19 10000
+          command: workspace/zig-out-release/bin/fuzz --seed 19 gossip-service 10000
 
   gossip_table_fuzz:
     executor: linux-executor
@@ -231,7 +231,7 @@ jobs:
           at: workspace
       - run:
           name: Run Gossip Table Fuzzer
-          command: workspace/zig-out-release/bin/fuzz gossip_table 19 100000
+          command: workspace/zig-out-release/bin/fuzz --seed 19 gossip-table 100000
 
   allocators_fuzz:
     executor: linux-executor
@@ -241,7 +241,7 @@ jobs:
           at: workspace
       - run:
           name: Run Allocators Fuzzer
-          command: workspace/zig-out-release/bin/fuzz allocators 19 10000
+          command: workspace/zig-out-release/bin/fuzz --seed 19 allocators 10000
 
   ledger_fuzz:
     executor: linux-executor
@@ -251,7 +251,7 @@ jobs:
           at: workspace
       - run:
           name: Run Ledger Fuzzer
-          command: workspace/zig-out-release/bin/fuzz ledger 19 10000
+          command: workspace/zig-out-release/bin/fuzz --seed 19 ledger 10000
 
   solana_conformance:
     executor: linux-executor

scripts/kcov_fuzz_allocators.sh

@@ -23,7 +23,7 @@ kcov \
     --include-pattern=src/utils/allocators.zig \
     --exclude-pattern=$HOME/.cache \
     kcov-output/ \
-    ./zig-out/bin/fuzz allocators 19 50_000
+    ./zig-out/bin/fuzz --seed 19 allocators 50_000
 
 # open report
 echo "=> Opening kcov-output/index.html" 

scripts/kcov_fuzz_gossip.sh

@@ -23,7 +23,7 @@ kcov \
     --include-pattern=src/gossip/ \
     --exclude-pattern=$HOME/.cache \
     kcov-output/ \
-    ./zig-out/bin/fuzz gossip_service 19 50_000
+    ./zig-out/bin/fuzz --seed 19 gossip-service 50_000
 
 # open report
 echo "=> Opening kcov-output/index.html" 

scripts/kcov_fuzz_gossip_table.sh

@@ -23,7 +23,7 @@ kcov \
     --include-pattern=src/gossip/ \
     --exclude-pattern=$HOME/.cache \
     kcov-output/ \
-    ./zig-out/bin/fuzz gossip_table 19 50_000
+    ./zig-out/bin/fuzz --seed 19 gossip-table 50_000
 
 # open report
 echo "=> Opening kcov-output/index.html" 

src/accountsdb/fuzz.zig

@@ -3,7 +3,6 @@ const sig = @import("../sig.zig");
 const cli = @import("cli");
 
 const Account = sig.runtime.AccountSharedData;
-const ChannelPrintLogger = sig.trace.ChannelPrintLogger;
 const Pubkey = sig.core.pubkey.Pubkey;
 const Slot = sig.core.time.Slot;
 
@@ -44,7 +43,7 @@ pub const TrackedAccount = struct {
 pub const RunCmd = struct {
     max_slots: ?Slot,
 
-    pub const parser = cli.Parser(RunCmd, .{
+    pub const cmd_info: cli.CommandInfo(RunCmd) = .{
         .help = .{
             .short = "Fuzz accountsdb.",
             .long = null,
@@ -59,12 +58,18 @@ pub const RunCmd = struct {
                 .help = "The number of slots number which, when surpassed, will exit the fuzzer.",
             },
         },
-    });
+    };
 };
 
 const Logger = sig.trace.Logger("accountsdb.fuzz");
 
-pub fn run(seed: u64, args: *std.process.ArgIterator) !void {
+pub fn run(
+    allocator: std.mem.Allocator,
+    logger: Logger,
+    seed: u64,
+    fuzz_data_dir: std.fs.Dir,
+    run_cmd: RunCmd,
+) !void {
     var prng_state: std.Random.DefaultPrng = .init(seed);
     const random = prng_state.random();
 
@@ -73,41 +78,8 @@ pub fn run(seed: u64, args: *std.process.ArgIterator) !void {
     const N_ACCOUNTS_MAX: u64 = 100_000;
     const N_ACCOUNTS_PER_SLOT = 10;
 
-    var gpa_state: std.heap.DebugAllocator(.{
-        .safety = true,
-    }) = .init;
-    defer _ = gpa_state.deinit();
-    const allocator = gpa_state.allocator();
-
-    const std_logger: *ChannelPrintLogger = try .init(.{
-        .allocator = allocator,
-        .max_level = .debug,
-        .max_buffer = 1 << 20,
-    }, null);
-    defer std_logger.deinit();
-    const logger: Logger = std_logger.logger("accountsdb.fuzz");
-
-    const run_cmd: RunCmd = cmd: {
-        var argv_list: std.ArrayListUnmanaged([]const u8) = .empty;
-        defer argv_list.deinit(allocator);
-        while (args.next()) |arg| try argv_list.append(allocator, arg);
-
-        const stderr = std.io.getStdErr();
-        const stderr_tty = std.io.tty.detectConfig(stderr);
-        break :cmd try RunCmd.parser.parse(
-            allocator,
-            "fuzz accountsdb",
-            stderr_tty,
-            stderr.writer(),
-            argv_list.items,
-        ) orelse return;
-    };
-
     const maybe_max_slots = run_cmd.max_slots;
 
-    var fuzz_data_dir = try std.fs.cwd().makeOpenPath(sig.FUZZ_DATA_DIR, .{});
-    defer fuzz_data_dir.close();
-
     const main_dir_name = "main";
     var main_accountsdb_dir = try fuzz_data_dir.makeOpenPath(main_dir_name, .{});
     defer main_accountsdb_dir.close();
@@ -128,9 +100,6 @@ pub fn run(seed: u64, args: *std.process.ArgIterator) !void {
         };
     };
 
-    var last_full_snapshot_validated_slot: Slot = 0;
-    var last_inc_snapshot_validated_slot: Slot = 0;
-
     const use_disk = random.boolean();
     logger.info().logf("use disk: {}", .{use_disk});
     var accounts_db: AccountsDB = try .init(.{
@@ -191,6 +160,8 @@ pub fn run(seed: u64, args: *std.process.ArgIterator) !void {
         }));
     }
 
+    var last_full_snapshot_validated_slot: Slot = 0;
+    var last_inc_snapshot_validated_slot: Slot = 0;
     var largest_rooted_slot: Slot = 0;
     var slot: Slot = 0;
 

src/accountsdb/fuzz_snapshot.zig

@@ -15,8 +15,7 @@ const SnapshotManifest = sig.accounts_db.Manifest;
 
 const MAX_FUZZ_TIME_NS = std.time.ns_per_s * 100_000;
 
-pub fn run(args: *std.process.ArgIterator) !void {
-    _ = args;
+pub fn run() !void {
     const seed = std.crypto.random.int(u64);
 
     var gpa: std.heap.DebugAllocator(.{}) = .init;