Skip to content

Commit

Permalink
chore: pr cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
lidatong committed Apr 29, 2024
1 parent e29f5d0 commit 9c820c4
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 232 deletions.
2 changes: 1 addition & 1 deletion src/choreo/fd_choreo_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- eqv: equivocation (also called "duplicate block") handling.
- forks: data structures and associated functions to manage "forks", ie. competing views in the
canonical state of the blockchain.
- ghost: fork choice rule, ie. which fork is the best that I should pick.
- ghost: fork choice rule, ie. which fork is the best one that I should pick.
- tower: TowerBFT rules for reaching consensus by "finalizing" blocks, ie. you
can no longer rollback a block or switch to a different fork.
Expand Down
225 changes: 0 additions & 225 deletions src/disco/consensus/test_consensus.c

This file was deleted.

4 changes: 2 additions & 2 deletions src/disco/shred/fd_shred_cap.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ fd_shred_cap_archive( fd_replay_t * replay, fd_shred_t const * shred, uchar flag
}

int
fd_shred_cap_replay( const char * shred_cap_path,
fd_shred_cap_replay( const char * shred_cap_fpath,
fd_replay_t * replay ) {
FILE * shred_cap = fopen( shred_cap_path, "rb" );
FILE * shred_cap = fopen( shred_cap_fpath, "rb" );
FD_TEST( shred_cap );

for( ;; ) {
Expand Down
4 changes: 2 additions & 2 deletions src/disco/shred/fd_shred_cap.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ typedef struct fd_shred_cap_hdr fd_shred_cap_hdr_t;

int fd_shred_cap_mark_stable( fd_replay_t * replay, ulong slot );
int fd_shred_cap_archive( fd_replay_t * replay, fd_shred_t const * shred , uchar flags);
int fd_shred_cap_replay( const char * shred_cap_path, fd_replay_t * replay );
int fd_shred_cap_replay( const char * shred_pcap, fd_replay_t * replay );

#endif
4 changes: 2 additions & 2 deletions src/disco/tvu/fd_replay.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,8 @@ fd_replay_slot_execute( fd_replay_t * replay,
}
fd_bank_hash_cmp_unlock( bank_hash_cmp );

fd_bft_fork_update( replay->bft, child );
fd_bft_fork_choice( replay->bft );
// fd_bft_fork_update( replay->bft, child );
// fd_bft_fork_choice( replay->bft );
}

void
Expand Down

0 comments on commit 9c820c4

Please sign in to comment.