Skip to content

refactor(choreo): deduplicate make_vote_account into test_tower_util #8271

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
mubarizkyc wants to merge 2 commits into
base: main
Choose a base branch
from
+30 −35
Open

refactor(choreo): deduplicate make_vote_account into test_tower_util #8271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94c53d1
move make_vote_account to common header
mubarizkyc Feb 12, 2026
0279391
Merge branch 'firedancer-io:main' into move_make_vote_account_to_common
mubarizkyc Feb 14, 2026
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
19 changes: 1 addition & 18 deletions src/choreo/tower/test_tower.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "test_tower_util.h"
#include "fd_epoch_stakes.h"
#include "fd_tower.c"
#include "fd_tower_forks.h"
Expand Down Expand Up @@ -224,24 +225,6 @@ static uchar scratch[ FD_TOWER_FOOTPRINT ] __attribute__((aligned(FD_TOWER_ALIGN
// // FD_TEST( 0==memcmp( restore + off, checkpt + off, sizeof(restore) - off ) );
// }

void
make_vote_account( fd_hash_t const * pubkey, ulong stake, ulong vote, uint conf, fd_tower_accts_t * out ) {
fd_voter_t voter = {
.kind = FD_VOTER_V3,
.v3 = {
.node_pubkey = *pubkey,
.votes_cnt = 1,
.votes = {
{ .slot = vote, .conf = conf },
},
}
};

memcpy( out->data, &voter, sizeof(fd_voter_t) );
out->stake = stake;
out->addr = *pubkey;
}

void test_tower_serde( fd_wksp_t * wksp ) {
fd_txn_p_t txnp[1];

Expand Down
18 changes: 1 addition & 17 deletions src/choreo/tower/test_tower_forks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
#include "test_tower_util.h"
#include "fd_tower_forks.h"
#include "../voter/fd_voter.h"

void
make_vote_account( fd_hash_t const * pubkey, ulong stake, ulong vote, uint conf, fd_tower_accts_t * out ) {
fd_voter_t voter = {
.kind = FD_VOTER_V3,
.v3 = {
.node_pubkey = *pubkey,
.votes_cnt = 1,
.votes = {
{ .slot = vote, .conf = conf },
},
}
};

memcpy( out->data, &voter, sizeof(fd_voter_t) );
out->stake = stake;
out->addr = *pubkey;
}

void
test_forks_lockouts( fd_wksp_t * wksp ) {
Expand Down
28 changes: 28 additions & 0 deletions src/choreo/tower/test_tower_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#ifndef HEADER_test_tower_util_h
#define HEADER_test_tower_util_h

#include "../voter/fd_voter.h"
#include "fd_tower_forks.h"
static inline void
make_vote_account(fd_hash_t const *pubkey,
ulong stake,
ulong vote,
uint conf,
fd_tower_accts_t *out)
{
fd_voter_t voter = {
.kind = FD_VOTER_V3,
.v3 = {
.node_pubkey = *pubkey,
.votes_cnt = 1,
.votes = {
{.slot = vote, .conf = conf},
},
}};

memcpy(out->data, &voter, sizeof(fd_voter_t));
out->stake = stake;
out->addr = *pubkey;
}

#endif /* HEADER_test_tower_util_h */