Skip to content

Remove unused 'wksp' argument from decode_ctx #4978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −17
Open

Remove unused 'wksp' argument from decode_ctx #4978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/flamenco/runtime/fd_executor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ status_check_tower( ulong slot, void * _ctx ) {

fd_slot_history_global_t * slot_history = fd_sysvar_slot_history_read( ctx->funk,
ctx->funk_txn,
ctx->spad,
ctx->spad_wksp );
ctx->spad );

if( fd_sysvar_slot_history_find_slot( slot_history,
slot,
Expand Down
3 changes: 1 addition & 2 deletions src/flamenco/runtime/sysvar/fd_sysvar_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ fd_sysvar_cache_restore_##name(
type##_decode() does not do heap allocations on failure */ \
fd_bincode_decode_ctx_t decode = { \
.data = account->vt->get_data( account ), \
.dataend = account->vt->get_data( account ) + account->vt->get_data_len( account ), \
.wksp = wksp \
.dataend = account->vt->get_data( account ) + account->vt->get_data_len( account ) \
}; \
ulong total_sz = 0UL; \
int err = type##_decode_footprint( &decode, &total_sz ); \
Expand Down
3 changes: 1 addition & 2 deletions src/flamenco/runtime/sysvar/fd_sysvar_slot_hashes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ fd_sysvar_slot_hashes_read( fd_exec_slot_ctx_t * slot_ctx,

fd_bincode_decode_ctx_t decode = {
.data = rec->vt->get_data( rec ),
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec ),
.wksp = slot_ctx->runtime_wksp
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec )
};

ulong total_sz = 0UL;
Expand Down
9 changes: 3 additions & 6 deletions src/flamenco/runtime/sysvar/fd_sysvar_slot_history.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ fd_sysvar_slot_history_update( fd_exec_slot_ctx_t * slot_ctx, fd_spad_t * runtim

fd_bincode_decode_ctx_t ctx = {
.data = rec->vt->get_data( rec ),
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec ),
.wksp = slot_ctx->runtime_wksp
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec )
};

ulong total_sz = 0UL;
Expand Down Expand Up @@ -143,8 +142,7 @@ fd_sysvar_slot_history_update( fd_exec_slot_ctx_t * slot_ctx, fd_spad_t * runtim
fd_slot_history_global_t *
fd_sysvar_slot_history_read( fd_funk_t * funk,
fd_funk_txn_t * funk_txn,
fd_spad_t * spad,
fd_wksp_t * wksp ) {
fd_spad_t * spad ) {

/* Set current_slot, and update next_slot */

Expand All @@ -158,8 +156,7 @@ fd_sysvar_slot_history_read( fd_funk_t * funk,

fd_bincode_decode_ctx_t ctx = {
.data = rec->vt->get_data( rec ),
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec ),
.wksp = wksp
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec )
};

ulong total_sz = 0UL;
Expand Down
3 changes: 1 addition & 2 deletions src/flamenco/runtime/sysvar/fd_sysvar_slot_history.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ fd_sysvar_slot_history_update( fd_exec_slot_ctx_t * slot_ctx,
fd_slot_history_global_t *
fd_sysvar_slot_history_read( fd_funk_t * funk,
fd_funk_txn_t * funk_txn,
fd_spad_t * spad,
fd_wksp_t * wksp );
fd_spad_t * spad );

int
fd_sysvar_slot_history_find_slot( fd_slot_history_global_t const * history,
Expand Down
3 changes: 0 additions & 3 deletions src/flamenco/types/fd_bincode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ struct fd_bincode_decode_ctx {
void const * data;
/* End of buffer */
void const * dataend;
/* Wksp for laddr to gaddr conversions */
/* TODO: This could be split out into a fd_bincode_global_decode_ctx */
fd_wksp_t * wksp;
};
typedef struct fd_bincode_decode_ctx fd_bincode_decode_ctx_t;

Expand Down
Loading