clean

Author: emwang-jump

src/discof/forest/fd_forest.c

@@ -443,8 +443,8 @@ fd_forest_data_shred_insert( fd_forest_t * forest, ulong slot, ushort parent_off
   }
 
   if( !fd_forest_ele_idxs_test( ele->idxs, shred_idx ) ) { /* newly seen shred */
-    ele->turbine_cnt += src == TURBINE;
-    ele->repair_cnt  += src == REPAIR;
+    ele->turbine_cnt += (src==TURBINE);
+    ele->repair_cnt  += (src==REPAIR);
   }
   if( FD_UNLIKELY( !slot_complete && ele->first_ts == 0 ) ) ele->first_ts = fd_tickcount();
 
@@ -460,16 +460,17 @@ fd_forest_ele_t *
 fd_forest_code_shred_insert( fd_forest_t * forest, ulong slot, uint shred_idx ) {
   //fd_forest_ele_t * pool = fd_forest_pool( forest );
   fd_forest_ele_t * ele  = query( forest, slot );
-  if( FD_UNLIKELY( !ele ) ) { /* very annoying, but if coding shred is the first shred in a slot, we can't create its ele without the parent */
+  if( FD_UNLIKELY( !ele ) ) {
+    /* very annoying, but if coding shred is the first shred in a slot,
+       we can't create its ele without the parent_off. But slight
+       in-accuracies in metrics are ok for now */
     return NULL;
-    //ele = acquire( forest, slot );
-    //fd_forest_ancestry_ele_insert( fd_forest_orphaned( forest ), ele, pool );
   }
 
-  if( !fd_forest_ele_idxs_test( ele->code, shred_idx ) ) { /* newly seen shred */
+  if( FD_LIKELY( !fd_forest_ele_idxs_test( ele->code, shred_idx ) ) ) { /* newly seen shred */
     ele->turbine_cnt += 1;
+    fd_forest_ele_idxs_insert( ele->code, shred_idx );
   }
-  fd_forest_ele_idxs_insert( ele->code, shred_idx );
   return ele;
 }
 

src/discof/reasm/fd_reasm.c

@@ -270,11 +270,6 @@ fd_reasm_insert( fd_reasm_t *      reasm,
   }
 
   if( FD_LIKELY( parent ) ) link( reasm, parent, fec );
-  // check if cmr is all 0s
-  fd_hash_t hash_null = { 0 };
-  if( FD_UNLIKELY( memcmp( chained_merkle_root->uc, hash_null.uc, sizeof(fd_hash_t) ) == 0 ) ) {
-    FD_LOG_WARNING(( "Slot %lu fec_set_idx %u chains off an invalid { 0 } merkle root. Expect replay to stall soon.", slot, fec_set_idx ));
-  }
 
   /* Second, we search for children of this new FEC and link them to it.
      By definition any children must be orphaned (a child cannot be part