Skip to content

Commit 30edd06

Browse files
committed
Remove unused 'wksp' argument from decode_ctx
1 parent 70a7175 commit 30edd06

File tree

6 files changed

+7
-17
lines changed

6 files changed

+7
-17
lines changed

src/flamenco/runtime/fd_executor.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@ status_check_tower( ulong slot, void * _ctx ) {
260260

261261
fd_slot_history_global_t * slot_history = fd_sysvar_slot_history_read( ctx->funk,
262262
ctx->funk_txn,
263-
ctx->spad,
264-
ctx->spad_wksp );
263+
ctx->spad );
265264

266265
if( fd_sysvar_slot_history_find_slot( slot_history,
267266
slot,

src/flamenco/runtime/sysvar/fd_sysvar_cache.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ fd_sysvar_cache_restore_##name(
122122
type##_decode() does not do heap allocations on failure */ \
123123
fd_bincode_decode_ctx_t decode = { \
124124
.data = account->vt->get_data( account ), \
125-
.dataend = account->vt->get_data( account ) + account->vt->get_data_len( account ), \
126-
.wksp = wksp \
125+
.dataend = account->vt->get_data( account ) + account->vt->get_data_len( account ) \
127126
}; \
128127
ulong total_sz = 0UL; \
129128
int err = type##_decode_footprint( &decode, &total_sz ); \

src/flamenco/runtime/sysvar/fd_sysvar_slot_hashes.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ fd_sysvar_slot_hashes_read( fd_exec_slot_ctx_t * slot_ctx,
146146

147147
fd_bincode_decode_ctx_t decode = {
148148
.data = rec->vt->get_data( rec ),
149-
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec ),
150-
.wksp = slot_ctx->runtime_wksp
149+
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec )
151150
};
152151

153152
ulong total_sz = 0UL;

src/flamenco/runtime/sysvar/fd_sysvar_slot_history.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ fd_sysvar_slot_history_update( fd_exec_slot_ctx_t * slot_ctx, fd_spad_t * runtim
9292

9393
fd_bincode_decode_ctx_t ctx = {
9494
.data = rec->vt->get_data( rec ),
95-
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec ),
96-
.wksp = slot_ctx->runtime_wksp
95+
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec )
9796
};
9897

9998
ulong total_sz = 0UL;
@@ -143,8 +142,7 @@ fd_sysvar_slot_history_update( fd_exec_slot_ctx_t * slot_ctx, fd_spad_t * runtim
143142
fd_slot_history_global_t *
144143
fd_sysvar_slot_history_read( fd_funk_t * funk,
145144
fd_funk_txn_t * funk_txn,
146-
fd_spad_t * spad,
147-
fd_wksp_t * wksp ) {
145+
fd_spad_t * spad ) {
148146

149147
/* Set current_slot, and update next_slot */
150148

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

159157
fd_bincode_decode_ctx_t ctx = {
160158
.data = rec->vt->get_data( rec ),
161-
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec ),
162-
.wksp = wksp
159+
.dataend = rec->vt->get_data( rec ) + rec->vt->get_data_len( rec )
163160
};
164161

165162
ulong total_sz = 0UL;

src/flamenco/runtime/sysvar/fd_sysvar_slot_history.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ fd_sysvar_slot_history_update( fd_exec_slot_ctx_t * slot_ctx,
2828
fd_slot_history_global_t *
2929
fd_sysvar_slot_history_read( fd_funk_t * funk,
3030
fd_funk_txn_t * funk_txn,
31-
fd_spad_t * spad,
32-
fd_wksp_t * wksp );
31+
fd_spad_t * spad );
3332

3433
int
3534
fd_sysvar_slot_history_find_slot( fd_slot_history_global_t const * history,

src/flamenco/types/fd_bincode.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ struct fd_bincode_decode_ctx {
3636
void const * data;
3737
/* End of buffer */
3838
void const * dataend;
39-
/* Wksp for laddr to gaddr conversions */
40-
/* TODO: This could be split out into a fd_bincode_global_decode_ctx */
41-
fd_wksp_t * wksp;
4239
};
4340
typedef struct fd_bincode_decode_ctx fd_bincode_decode_ctx_t;
4441

0 commit comments

Comments
 (0)