wip

Author: ibhatt-jumptrading

src/flamenco/runtime/context/fd_exec_txn_ctx.c

@@ -144,31 +144,6 @@ fd_exec_txn_ctx_get_key_of_account_at_index( fd_exec_txn_ctx_t *  ctx,
   return FD_EXECUTOR_INSTR_SUCCESS;
 }
 
-void
-fd_exec_txn_ctx_setup_basic( fd_exec_txn_ctx_t * ctx ) {
-  fd_compute_budget_details_new( &ctx->details.compute_budget );
-  ctx->instr.stack_sz            = 0;
-  ctx->accounts.accounts_cnt     = 0UL;
-  ctx->accounts.executable_cnt   = 0UL;
-  ctx->prog_cache.programs_to_reverify_cnt  = 0UL;
-
-  ctx->details.loaded_accounts_data_size      = 0UL;
-  ctx->details.loaded_accounts_data_size_cost = 0UL;
-  ctx->details.accounts_resize_delta          = 0UL;
-
-  memset( ctx->details.return_data.program_id.key, 0, sizeof(fd_pubkey_t) );
-  ctx->details.return_data.len = 0;
-
-  ctx->log.capture_ctx   = NULL;
-
-  ctx->instr.info_cnt     = 0UL;
-  ctx->instr.trace_length = 0UL;
-
-  ctx->err.exec_err          = 0;
-  ctx->err.exec_err_kind     = FD_EXECUTOR_ERR_KIND_NONE;
-  ctx->instr.current_idx = 0;
-}
-
 void
 fd_exec_txn_ctx_teardown( fd_exec_txn_ctx_t * ctx ) {
   (void)ctx;

src/flamenco/runtime/context/fd_exec_txn_ctx.h

@@ -208,11 +208,6 @@ fd_exec_txn_ctx_leave( fd_exec_txn_ctx_t * ctx );
 void *
 fd_exec_txn_ctx_delete( void * mem );
 
-/* Sets up a basic transaction ctx without a txn descriptor or txn raw. Useful
-   for mocking transaction context objects for instructions. */
-void
-fd_exec_txn_ctx_setup_basic( fd_exec_txn_ctx_t * ctx );
-
 void
 fd_exec_txn_ctx_teardown( fd_exec_txn_ctx_t * txn_ctx );
 

src/flamenco/runtime/program/fd_bpf_loader_program.c

@@ -2629,7 +2629,27 @@ fd_directly_invoke_loader_v3_deploy( fd_bank_t *               bank,
                          NULL,
                          0UL );
 
-  fd_exec_txn_ctx_setup_basic( txn_ctx );
+  fd_compute_budget_details_new( &txn_ctx->details.compute_budget );
+  txn_ctx->accounts.accounts_cnt     = 0UL;
+  txn_ctx->accounts.executable_cnt   = 0UL;
+  txn_ctx->prog_cache.programs_to_reverify_cnt  = 0UL;
+
+  txn_ctx->details.loaded_accounts_data_size      = 0UL;
+  txn_ctx->details.loaded_accounts_data_size_cost = 0UL;
+  txn_ctx->details.accounts_resize_delta          = 0UL;
+
+  memset( txn_ctx->details.return_data.program_id.key, 0, sizeof(fd_pubkey_t) );
+  txn_ctx->details.return_data.len = 0;
+
+  txn_ctx->log.capture_ctx   = NULL;
+
+  txn_ctx->instr.info_cnt     = 0UL;
+  txn_ctx->instr.trace_length = 0UL;
+
+  txn_ctx->err.exec_err          = 0;
+  txn_ctx->err.exec_err_kind     = FD_EXECUTOR_ERR_KIND_NONE;
+  txn_ctx->instr.current_idx = 0;
+
   txn_ctx->instr.stack_sz = 1;
   fd_exec_instr_ctx_t * instr_ctx = &txn_ctx->instr.stack[0];
   *instr_ctx = (fd_exec_instr_ctx_t) {

src/flamenco/runtime/tests/fd_instr_harness.c

@@ -90,7 +90,28 @@ fd_solfuzz_pb_instr_ctx_create( fd_solfuzz_runner_t *                runner,
                          NULL,
                          progcache_scratch,
                          FD_PROGCACHE_SCRATCH_FOOTPRINT );
-  fd_exec_txn_ctx_setup_basic( txn_ctx );
+
+  fd_compute_budget_details_new( &txn_ctx->details.compute_budget );
+  txn_ctx->instr.stack_sz            = 0;
+  txn_ctx->accounts.accounts_cnt     = 0UL;
+  txn_ctx->accounts.executable_cnt   = 0UL;
+  txn_ctx->prog_cache.programs_to_reverify_cnt  = 0UL;
+
+  txn_ctx->details.loaded_accounts_data_size      = 0UL;
+  txn_ctx->details.loaded_accounts_data_size_cost = 0UL;
+  txn_ctx->details.accounts_resize_delta          = 0UL;
+
+  memset( txn_ctx->details.return_data.program_id.key, 0, sizeof(fd_pubkey_t) );
+  txn_ctx->details.return_data.len = 0;
+
+  txn_ctx->log.capture_ctx   = NULL;
+
+  txn_ctx->instr.info_cnt     = 0UL;
+  txn_ctx->instr.trace_length = 0UL;
+
+  txn_ctx->err.exec_err       = 0;
+  txn_ctx->err.exec_err_kind  = FD_EXECUTOR_ERR_KIND_NONE;
+  txn_ctx->instr.current_idx  = 0;
 
   txn_ctx->txn                                               = *txn;
   txn_ctx->details.compute_budget.compute_unit_limit = test_ctx->cu_avail;