idk questionable

Author: emwang-jump

src/discof/forest/fd_forest.c

@@ -1077,11 +1077,8 @@ int
 fd_forest_evict( fd_forest_t * forest, ulong new_slot, ulong parent_slot ) {
   FD_LOG_NOTICE(( "fd_forest_eviction_time" ));
   fd_forest_ancestry_t * ancestry = fd_forest_ancestry( forest );
-  fd_forest_orphaned_t * orphaned = fd_forest_orphaned( forest );
   fd_forest_frontier_t * frontier = fd_forest_frontier( forest );
-  fd_forest_subtrees_t * subtrees = fd_forest_subtrees( forest );
   fd_forest_subtlist_t * subtlist = fd_forest_subtlist( forest );
-  fd_forest_ref_t *      conspool = fd_forest_conspool( forest );
   fd_forest_blk_t *      pool     = fd_forest_pool( forest );
   ulong                  null     = fd_forest_pool_idx_null( pool );
 
@@ -1095,7 +1092,7 @@ fd_forest_evict( fd_forest_t * forest, ulong new_slot, ulong parent_slot ) {
     /* We'll keep it if it's older than all of our orphans, or if it's
        parent is part of the main tree. */
 
-    ulong evict_orphan_slot = ULONG_MAX; /* best orphan candidate for eviction is the newest one. */
+    ulong evict_orphan_slot = ULONG_MAX; /* best orphan candidate for eviction is the newest subtree. */
     for( fd_forest_subtlist_iter_t iter = fd_forest_subtlist_iter_fwd_init( subtlist, pool );
                                          !fd_forest_subtlist_iter_done( iter, subtlist, pool );
                                    iter = fd_forest_subtlist_iter_fwd_next( iter, subtlist, pool ) ) {
@@ -1104,14 +1101,17 @@ fd_forest_evict( fd_forest_t * forest, ulong new_slot, ulong parent_slot ) {
       else                                              evict_orphan_slot = fd_ulong_max( evict_orphan_slot, ele->slot );
 
     }
-    /// TODO: idk should we evict the whole subtree??? or just like the leafy
+    /* We are connecting to the main tree. Nuke the orphan. */
     if( fd_forest_ancestry_ele_query( ancestry, &parent_slot, NULL, pool ) ||
         fd_forest_frontier_ele_query( frontier, &parent_slot, NULL, pool ) ) {
-      // choose something to evict from orphans
+      // evict_orphan_slot
 
       return SLOT_INSERT;
     }
 
+
+    /* We ourselves are an orphan. Should we evict something else or just evict ourselves?
+       We'll keep it if it's older than all of our orphans */
     for( fd_forest_subtlist_iter_t iter = fd_forest_subtlist_iter_fwd_init( subtlist,       pool );
                                          !fd_forest_subtlist_iter_done    ( iter, subtlist, pool );
                                    iter = fd_forest_subtlist_iter_fwd_next( iter, subtlist, pool ) ) {