fuzz: fix conflicting definitions for loading accounts (#7021)

Author: mjain-jump

src/flamenco/runtime/tests/fd_block_harness.c

@@ -297,7 +297,7 @@ fd_solfuzz_pb_block_ctx_create( fd_solfuzz_runner_t *                runner,
   vote_states = fd_bank_vote_states_locking_modify( bank );
   for( ushort i=0; i<test_ctx->acct_states_count; i++ ) {
     fd_txn_account_t acc[1];
-    fd_solfuzz_pb_load_account( acc, funk, xid, &test_ctx->acct_states[i], 1 );
+    fd_solfuzz_pb_load_account( acc, accdb, xid, &test_ctx->acct_states[i], 1 );
 
     /* Update vote accounts cache for epoch T */
     fd_pubkey_t pubkey;
@@ -621,7 +621,7 @@ fd_solfuzz_pb_build_leader_schedule_effects( fd_solfuzz_runner_t *
     /* One ahead of parent epoch, so use current acct_states */
     for ( ushort i=0; i<test_ctx->acct_states_count; i++ ) {
       fd_txn_account_t acc[1];
-      fd_solfuzz_pb_load_account( acc, runner->accdb->funk, xid, &test_ctx->acct_states[i], 1 );
+      fd_solfuzz_pb_load_account( acc, runner->accdb, xid, &test_ctx->acct_states[i], 1 );
       fd_pubkey_t pubkey;
       memcpy( &pubkey, test_ctx->acct_states[i].address, sizeof(fd_pubkey_t) );
       fd_solfuzz_block_register_vote_account( runner->accdb->funk, xid, tmp_vs, &pubkey );

src/flamenco/runtime/tests/fd_harness_common.c

@@ -1,3 +1,4 @@
+#include "fd_solfuzz_private.h"
 #include "generated/context.pb.h"
 #include "../fd_acc_mgr.h"
 #include "../../features/fd_features.h"
@@ -26,12 +27,12 @@ fd_solfuzz_pb_load_account( fd_txn_account_t *                acc,
   fd_funk_rec_prepare_t prepare = {0};
 
   int ok = !!fd_txn_account_init_from_funk_mutable( /* acc         */ acc,
-                                                   /* pubkey      */ pubkey,
-                                                   /* funk        */ accdb,
-                                                   /* xid         */ xid,
-                                                   /* do_create   */ 1,
-                                                   /* min_data_sz */ size,
-                                                   /* prepare     */ &prepare );
+                                                    /* pubkey      */ pubkey,
+                                                    /* funk        */ accdb,
+                                                    /* xid         */ xid,
+                                                    /* do_create   */ 1,
+                                                    /* min_data_sz */ size,
+                                                    /* prepare     */ &prepare );
   assert( ok );
 
   if( state->data ) {

src/flamenco/runtime/tests/fd_instr_harness.c

@@ -129,7 +129,7 @@ fd_solfuzz_pb_instr_ctx_create( fd_solfuzz_runner_t *                runner,
     fd_pubkey_t * acc_key = (fd_pubkey_t *)test_ctx->accounts[j].address;
 
     memcpy(  &(txn_ctx->account_keys[j]), test_ctx->accounts[j].address, sizeof(fd_pubkey_t) );
-    if( !fd_solfuzz_pb_load_account( &accts[j], funk, xid, &test_ctx->accounts[j], 0 ) ) {
+    if( !fd_solfuzz_pb_load_account( &accts[j], runner->accdb, xid, &test_ctx->accounts[j], 0 ) ) {
       return 0;
     }
 

src/flamenco/runtime/tests/fd_solfuzz_private.h

@@ -17,7 +17,7 @@ FD_PROTOTYPES_BEGIN
    zero-lamport accounts from being loaded in. */
 int
 fd_solfuzz_pb_load_account( fd_txn_account_t *                acc,
-                            fd_funk_t *                       funk,
+                            fd_accdb_user_t *                 accdb,
                             fd_funk_txn_xid_t const *         xid,
                             fd_exec_test_acct_state_t const * state,
                             uchar                             reject_zero_lamports );

src/flamenco/runtime/tests/fd_txn_harness.c

@@ -82,7 +82,7 @@ fd_solfuzz_pb_txn_ctx_create( fd_solfuzz_runner_t *              runner,
     /* Load the accounts into the account manager
        Borrowed accounts get reset anyways - we just need to load the account somewhere */
     fd_txn_account_t acc[1];
-    fd_solfuzz_pb_load_account( acc, funk, &xid, &test_ctx->account_shared_data[i], 1 );
+    fd_solfuzz_pb_load_account( acc, accdb, &xid, &test_ctx->account_shared_data[i], 1 );
   }
 
   /* Setup Bank manager */