types: improve code gen for simple enums

src/flamenco/runtime/program/fd_stake_program.c

@@ -68,9 +68,9 @@
 #define DEFAULT_SLASH_PENALTY                      ( 12 )
 
 #define STAKE_AUTHORIZE_STAKER                                                                     \
-  ( ( fd_stake_authorize_t ){ .discriminant = fd_stake_authorize_enum_staker, .inner = {0} } )
+  ( ( fd_stake_authorize_t ){ .discriminant = fd_stake_authorize_enum_staker } )
 #define STAKE_AUTHORIZE_WITHDRAWER                                                                 \
-  ( ( fd_stake_authorize_t ){ .discriminant = fd_stake_authorize_enum_withdrawer, .inner = {0} } )
+  ( ( fd_stake_authorize_t ){ .discriminant = fd_stake_authorize_enum_withdrawer } )
 
 // https://github.com/anza-xyz/agave/blob/c8685ce0e1bb9b26014f1024de2cd2b8c308cbde/programs/stake/src/stake_instruction.rs#L51
 #define DEFAULT_COMPUTE_UNITS 750UL

src/flamenco/types/fd_fuzz_types.h

@@ -688,14 +688,11 @@ void *fd_snapshot_slot_acc_vecs_generate( void *mem, void **alloc_mem, fd_rng_t
   return mem;
 }
 
-void fd_reward_type_inner_generate( fd_reward_type_inner_t * self, void **alloc_mem, uint discriminant, fd_rng_t * rng ) {
-}
 void *fd_reward_type_generate( void *mem, void **alloc_mem, fd_rng_t * rng ) {
   fd_reward_type_t *self = (fd_reward_type_t *) mem;
   *alloc_mem = (uchar *) *alloc_mem + sizeof(fd_reward_type_t);
   fd_reward_type_new(mem);
   self->discriminant = fd_rng_uint( rng ) % 4;
-  fd_reward_type_inner_generate( &self->inner, alloc_mem, self->discriminant, rng );
   return mem;
 }
 
@@ -1572,14 +1569,11 @@ void *fd_firedancer_bank_generate( void *mem, void **alloc_mem, fd_rng_t * rng )
   return mem;
 }
 
-void fd_cluster_type_inner_generate( fd_cluster_type_inner_t * self, void **alloc_mem, uint discriminant, fd_rng_t * rng ) {
-}
 void *fd_cluster_type_generate( void *mem, void **alloc_mem, fd_rng_t * rng ) {
   fd_cluster_type_t *self = (fd_cluster_type_t *) mem;
   *alloc_mem = (uchar *) *alloc_mem + sizeof(fd_cluster_type_t);
   fd_cluster_type_new(mem);
   self->discriminant = fd_rng_uint( rng ) % 4;
-  fd_cluster_type_inner_generate( &self->inner, alloc_mem, self->discriminant, rng );
   return mem;
 }
 
@@ -1901,14 +1895,11 @@ void *fd_vote_init_generate( void *mem, void **alloc_mem, fd_rng_t * rng ) {
   return mem;
 }
 
-void fd_vote_authorize_inner_generate( fd_vote_authorize_inner_t * self, void **alloc_mem, uint discriminant, fd_rng_t * rng ) {
-}
 void *fd_vote_authorize_generate( void *mem, void **alloc_mem, fd_rng_t * rng ) {
   fd_vote_authorize_t *self = (fd_vote_authorize_t *) mem;
   *alloc_mem = (uchar *) *alloc_mem + sizeof(fd_vote_authorize_t);
   fd_vote_authorize_new(mem);
   self->discriminant = fd_rng_uint( rng ) % 2;
-  fd_vote_authorize_inner_generate( &self->inner, alloc_mem, self->discriminant, rng );
   return mem;
 }
 
@@ -2179,14 +2170,11 @@ void *fd_system_program_instruction_generate( void *mem, void **alloc_mem, fd_rn
   return mem;
 }
 
-void fd_system_error_inner_generate( fd_system_error_inner_t * self, void **alloc_mem, uint discriminant, fd_rng_t * rng ) {
-}
 void *fd_system_error_generate( void *mem, void **alloc_mem, fd_rng_t * rng ) {
   fd_system_error_t *self = (fd_system_error_t *) mem;
   *alloc_mem = (uchar *) *alloc_mem + sizeof(fd_system_error_t);
   fd_system_error_new(mem);
   self->discriminant = fd_rng_uint( rng ) % 9;
-  fd_system_error_inner_generate( &self->inner, alloc_mem, self->discriminant, rng );
   return mem;
 }
 
@@ -2239,14 +2227,11 @@ void *fd_stake_lockup_custodian_args_generate( void *mem, void **alloc_mem, fd_r
   return mem;
 }
 
-void fd_stake_authorize_inner_generate( fd_stake_authorize_inner_t * self, void **alloc_mem, uint discriminant, fd_rng_t * rng ) {
-}
 void *fd_stake_authorize_generate( void *mem, void **alloc_mem, fd_rng_t * rng ) {
   fd_stake_authorize_t *self = (fd_stake_authorize_t *) mem;
   *alloc_mem = (uchar *) *alloc_mem + sizeof(fd_stake_authorize_t);
   fd_stake_authorize_new(mem);
   self->discriminant = fd_rng_uint( rng ) % 2;
-  fd_stake_authorize_inner_generate( &self->inner, alloc_mem, self->discriminant, rng );
   return mem;
 }