funk: simplify rec_key_hash1

Author: riptl

src/discof/restore/fd_snapin_tile_funk.c

@@ -124,7 +124,7 @@ fd_snapin_process_account_batch_funk( fd_snapin_tile_t *            ctx,
   for( ulong i=0UL; i<FD_SSPARSE_ACC_BATCH_MAX; i++ ) {
     uchar const * frame  = result->account_batch.batch[ i ];
     uchar const * pubkey = frame+0x10UL;
-    ulong         memo   = fd_funk_rec_key_hash1( pubkey, 0UL, rec_map->map->seed );
+    ulong         memo   = fd_funk_rec_key_hash1( pubkey, rec_map->map->seed );
     chain_idx[ i ] = (uint)( memo&chain_mask );
   }
 

src/flamenco/gossip/crds/fd_crds.c

@@ -235,7 +235,7 @@ lookup_hash( fd_crds_key_t const * key,
   default:
     break;
   }
-  return fd_funk_rec_key_hash1( key->pubkey, hash_fn, seed );
+  return fd_funk_rec_key_hash1( key->pubkey, seed^hash_fn );
 }
 
 static inline int

src/flamenco/runtime/fd_blockhashes.h

@@ -42,7 +42,7 @@ typedef struct fd_blockhash_info fd_blockhash_info_t;
 #define MAP_IDX_T         ushort
 #define MAP_NEXT          next
 #define MAP_KEY_EQ(k0,k1) fd_hash_eq( (k0), (k1) )
-#define MAP_KEY_HASH(k,s) fd_funk_rec_key_hash1( (k->uc), 0, (s) )
+#define MAP_KEY_HASH(k,s) fd_funk_rec_key_hash1( (k->uc), (s) )
 #include "../../util/tmpl/fd_map_chain.c"
 
 /* fd_blockhashes_t is the class representing a blockhash queue.

src/flamenco/stakes/fd_stake_delegations.c

@@ -13,7 +13,7 @@
 #define MAP_ELE_T              fd_stake_delegation_t
 #define MAP_KEY                stake_account
 #define MAP_KEY_EQ(k0,k1)      (fd_pubkey_eq( k0, k1 ))
-#define MAP_KEY_HASH(key,seed) (fd_funk_rec_key_hash1( (uchar *)key, 0, seed ))
+#define MAP_KEY_HASH(key,seed) (fd_funk_rec_key_hash1( key->uc, seed ))
 #define MAP_NEXT               next_
 #include "../../util/tmpl/fd_map_chain.c"
 

src/funk/fd_funk_base.h

@@ -166,16 +166,14 @@ fd_xxh3_mul128_fold64( ulong lhs, ulong rhs ) {
 
 static inline ulong
 fd_xxh3_mix16b( ulong i0, ulong i1,
-             ulong s0, ulong s1,
-             ulong seed ) {
+                ulong s0, ulong s1,
+                ulong seed ) {
   return fd_xxh3_mul128_fold64( i0 ^ (s0 + seed), i1 ^ (s1 - seed) );
 }
 
 FD_FN_PURE static inline ulong
 fd_funk_rec_key_hash1( uchar const key[ 32 ],
-                       ulong       rec_type,
                        ulong       seed ) {
-  seed ^= rec_type;
   ulong k0 = FD_LOAD( ulong, key+ 0 );
   ulong k1 = FD_LOAD( ulong, key+ 8 );
   ulong k2 = FD_LOAD( ulong, key+16 );
@@ -192,7 +190,7 @@ fd_funk_rec_key_hash1( uchar const key[ 32 ],
 FD_FN_PURE static inline ulong
 fd_funk_rec_key_hash( fd_funk_rec_key_t const * k,
                       ulong                     seed ) {
-  return fd_funk_rec_key_hash1( k->uc, 0UL, seed );
+  return fd_funk_rec_key_hash1( k->uc, seed );
 }
 
 #else
@@ -204,9 +202,7 @@ fd_funk_rec_key_hash( fd_funk_rec_key_t const * k,
 
 FD_FN_PURE static inline ulong
 fd_funk_rec_key_hash1( uchar const key[ 32 ],
-                       ulong       rec_type,
                        ulong       seed ) {
-  seed ^= rec_type;
   /* tons of ILP */
   return (fd_ulong_hash( seed ^ (1UL<<0) ^ FD_LOAD( ulong, key+ 0 ) )   ^
           fd_ulong_hash( seed ^ (1UL<<1) ^ FD_LOAD( ulong, key+ 8 ) ) ) ^
@@ -217,7 +213,7 @@ fd_funk_rec_key_hash1( uchar const key[ 32 ],
 FD_FN_PURE static inline ulong
 fd_funk_rec_key_hash( fd_funk_rec_key_t const * k,
                       ulong                     seed ) {
-  return fd_funk_rec_key_hash1( k->uc, 0UL, seed );
+  return fd_funk_rec_key_hash1( k->uc, seed );
 }
 
 #endif /* FD_HAS_INT128 */