spacing

Author: emwang-jump

src/choreo/tower/fd_epoch_stakes.c

@@ -22,16 +22,16 @@ fd_epoch_stakes_new( void * shmem, ulong slot_max ) {
 
   FD_SCRATCH_ALLOC_INIT( l, shmem );
   fd_epoch_stakes_t * epoch_stakes          = FD_SCRATCH_ALLOC_APPEND( l, alignof(fd_epoch_stakes_t),       sizeof(fd_epoch_stakes_t) );
-  void *              voter_stake_map       = FD_SCRATCH_ALLOC_APPEND( l, fd_voter_stake_map_align(),       fd_voter_stake_map_footprint( FD_VOTER_MAX * slot_max ) );
+  void *              voter_stake_map       = FD_SCRATCH_ALLOC_APPEND( l, fd_voter_stake_map_align(),       fd_voter_stake_map_footprint ( FD_VOTER_MAX * slot_max ) );
   void *              voter_stake_pool      = FD_SCRATCH_ALLOC_APPEND( l, fd_voter_stake_pool_align(),      fd_voter_stake_pool_footprint( FD_VOTER_MAX * slot_max ) );
   void *              epoch_stakes_slot_map = FD_SCRATCH_ALLOC_APPEND( l, fd_epoch_stakes_slot_map_align(), fd_epoch_stakes_slot_map_footprint( lg_slot_cnt ) );
   void *              used_acc_scratch      = FD_SCRATCH_ALLOC_APPEND( l, fd_used_acc_scratch_align(),      fd_used_acc_scratch_footprint( FD_VOTER_MAX * slot_max ) );
-  FD_LOG_NOTICE(( " layout l: %lu, shmem: %lu, footprint: %lu", _l, (ulong)shmem, footprint ));
-  //FD_TEST( FD_SCRATCH_ALLOC_FINI( l, fd_epoch_stakes_align() ) == (ulong)shmem + footprint );
-  epoch_stakes->voter_stake_map  = fd_voter_stake_map_join( fd_voter_stake_map_new( voter_stake_map, FD_VOTER_MAX * slot_max, 0 ) );
-  epoch_stakes->voter_stake_pool = fd_voter_stake_pool_join( fd_voter_stake_pool_new( voter_stake_pool, FD_VOTER_MAX * slot_max ) );
+  FD_TEST( FD_SCRATCH_ALLOC_FINI( l, fd_epoch_stakes_align() ) == (ulong)shmem + footprint );
+
+  epoch_stakes->voter_stake_map  = fd_voter_stake_map_join      ( fd_voter_stake_map_new      ( voter_stake_map,  FD_VOTER_MAX * slot_max, 0 ) );
+  epoch_stakes->voter_stake_pool = fd_voter_stake_pool_join     ( fd_voter_stake_pool_new     ( voter_stake_pool, FD_VOTER_MAX * slot_max ) );
   epoch_stakes->slot_stakes_map  = fd_epoch_stakes_slot_map_join( fd_epoch_stakes_slot_map_new( epoch_stakes_slot_map, lg_slot_cnt ) );
-  epoch_stakes->used_acc_scratch = fd_used_acc_scratch_join( fd_used_acc_scratch_new( used_acc_scratch, FD_VOTER_MAX * slot_max ) );
+  epoch_stakes->used_acc_scratch = fd_used_acc_scratch_join     ( fd_used_acc_scratch_new     ( used_acc_scratch, FD_VOTER_MAX * slot_max ) );
   return shmem;
 }
 

src/choreo/tower/fd_epoch_stakes.h

@@ -52,7 +52,6 @@ typedef struct fd_voter_stake fd_voter_stake_t;
 
 #define MAP_NAME                fd_voter_stake_map
 #define MAP_ELE_T               fd_voter_stake_t
-#define MAP_KEY                 key
 #define MAP_KEY_T               fd_voter_stake_key_t
 #define MAP_KEY_EQ(k0,k1)       (!memcmp( k0, k1, sizeof(fd_voter_stake_key_t) ))
 #define MAP_KEY_HASH(key, seed) fd_ulong_hash( ((key)->slot) ^ ((key)->vote_account.ul[0]) ^ (seed) )
@@ -84,7 +83,7 @@ typedef struct fd_epoch_stakes_slot fd_epoch_stakes_slot_t;
 #define MAP_MEMOIZE 0
 #include "../../util/tmpl/fd_map_dynamic.c"
 
-struct __attribute__((aligned(32))) fd_epoch_stakes {
+struct fd_epoch_stakes {
   fd_voter_stake_map_t   * voter_stake_map;
   fd_voter_stake_t       * voter_stake_pool;
   fd_epoch_stakes_slot_t * slot_stakes_map;