Improve reduced tree fork choice

beacon_node/client/src/beacon_chain_types.rs

@@ -1,8 +1,9 @@
 use beacon_chain::{
-    fork_choice::OptimizedLMDGhost, slot_clock::SystemTimeSlotClock, store::Store, BeaconChain,
-    BeaconChainTypes,
+    lmd_ghost::{LmdGhost, ThreadSafeReducedTree},
+    slot_clock::SystemTimeSlotClock,
+    store::Store,
+    BeaconChain, BeaconChainTypes,
 };
-use fork_choice::ForkChoice;
 use slog::{info, Logger};
 use slot_clock::SlotClock;
 use std::marker::PhantomData;
@@ -33,7 +34,7 @@ pub struct ClientType<S: Store, E: EthSpec> {
 impl<S: Store, E: EthSpec + Clone> BeaconChainTypes for ClientType<S, E> {
     type Store = S;
     type SlotClock = SystemTimeSlotClock;
-    type ForkChoice = OptimizedLMDGhost<S, E>;
+    type LmdGhost = ThreadSafeReducedTree<S, E>;
     type EthSpec = E;
 }
 impl<T: Store, E: EthSpec, X: BeaconChainTypes> InitialiseBeaconChain<X> for ClientType<T, E> {}
@@ -45,8 +46,8 @@ fn maybe_load_from_store_for_testnet<T, U: Store, V: EthSpec>(
     log: Logger,
 ) -> BeaconChain<T>
 where
-    T: BeaconChainTypes<Store = U>,
-    T::ForkChoice: ForkChoice<U>,
+    T: BeaconChainTypes<Store = U, EthSpec = V>,
+    T::LmdGhost: LmdGhost<U, V>,
 {
     if let Ok(Some(beacon_chain)) = BeaconChain::from_store(store.clone(), spec.clone()) {
         info!(
@@ -74,19 +75,10 @@ where
             genesis_state.genesis_time,
             spec.seconds_per_slot,
         );
-        // Choose the fork choice
-        let fork_choice = T::ForkChoice::new(store.clone());
 
         // Genesis chain
         //TODO: Handle error correctly
-        BeaconChain::from_genesis(
-            store,
-            slot_clock,
-            genesis_state,
-            genesis_block,
-            spec,
-            fork_choice,
-        )
-        .expect("Terminate if beacon chain generation fails")
+        BeaconChain::from_genesis(store, slot_clock, genesis_state, genesis_block, spec)
+            .expect("Terminate if beacon chain generation fails")
     }
 }