Fix issues with testnet dir and update docs (#992)

beacon_node/client/Cargo.toml

@@ -36,7 +36,6 @@ url = "2.1.0"
 eth1 = { path = "../eth1" }
 genesis = { path = "../genesis" }
 environment = { path = "../../lighthouse/environment" }
-lighthouse_bootstrap = { path = "../../eth2/utils/lighthouse_bootstrap" }
 eth2_ssz = { path = "../../eth2/utils/ssz" }
 lazy_static = "1.4.0"
 lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }

beacon_node/client/src/builder.rs

@@ -16,10 +16,7 @@ use eth1::{Config as Eth1Config, Service as Eth1Service};
 use eth2_config::Eth2Config;
 use eth2_libp2p::NetworkGlobals;
 use futures::{future, Future, IntoFuture};
-use genesis::{
-    generate_deterministic_keypairs, interop_genesis_state, state_from_ssz_file, Eth1GenesisService,
-};
-use lighthouse_bootstrap::Bootstrapper;
+use genesis::{generate_deterministic_keypairs, interop_genesis_state, Eth1GenesisService};
 use network::{NetworkConfig, NetworkMessage, NetworkService};
 use slog::info;
 use ssz::Decode;
@@ -163,12 +160,13 @@ where
                 //
                 // Alternatively, if there's a beacon chain in the database then always resume
                 // using it.
-                let client_genesis = if client_genesis == ClientGenesis::Resume && !chain_exists {
+                let client_genesis = if client_genesis == ClientGenesis::FromStore && !chain_exists
+                {
                     info!(context.log, "Defaulting to deposit contract genesis");
 
                     ClientGenesis::DepositContract
                 } else if chain_exists {
-                    ClientGenesis::Resume
+                    ClientGenesis::FromStore
                 } else {
                     client_genesis
                 };
@@ -189,16 +187,6 @@ where
 
                             Box::new(future)
                         }
-                        ClientGenesis::SszFile { path } => {
-                            let result = state_from_ssz_file(path);
-
-                            let future = result
-                                .and_then(move |genesis_state| builder.genesis_state(genesis_state))
-                                .into_future()
-                                .map(|v| (v, None));
-
-                            Box::new(future)
-                        }
                         ClientGenesis::SszBytes {
                             genesis_state_bytes,
                         } => {
@@ -237,25 +225,7 @@ where
 
                             Box::new(future)
                         }
-                        ClientGenesis::RemoteNode { server, .. } => {
-                            let future = Bootstrapper::connect(server, &context.log)
-                                .map_err(|e| {
-                                    format!("Failed to initialize bootstrap client: {}", e)
-                                })
-                                .into_future()
-                                .and_then(|bootstrapper| {
-                                    let (genesis_state, _genesis_block) =
-                                        bootstrapper.genesis().map_err(|e| {
-                                            format!("Failed to bootstrap genesis state: {}", e)
-                                        })?;
-
-                                    builder.genesis_state(genesis_state)
-                                })
-                                .map(|v| (v, None));
-
-                            Box::new(future)
-                        }
-                        ClientGenesis::Resume => {
+                        ClientGenesis::FromStore => {
                             let future = builder.resume_from_db().into_future().map(|v| (v, None));
 
                             Box::new(future)

beacon_node/client/src/config.rs

@@ -14,26 +14,21 @@ const DEFAULT_FREEZER_DB_DIR: &str = "freezer_db";
 /// Defines how the client should initialize the `BeaconChain` and other components.
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
 pub enum ClientGenesis {
-    /// Reads the genesis state and other persisted data from the `Store`.
-    Resume,
     /// Creates a genesis state as per the 2019 Canada interop specifications.
     Interop {
         validator_count: usize,
         genesis_time: u64,
     },
+    /// Reads the genesis state and other persisted data from the `Store`.
+    FromStore,
     /// Connects to an eth1 node and waits until it can create the genesis state from the deposit
     /// contract.
     DepositContract,
-    /// Loads the genesis state from a SSZ-encoded `BeaconState` file.
-    SszFile { path: PathBuf },
     /// Loads the genesis state from SSZ-encoded `BeaconState` bytes.
     ///
     /// We include the bytes instead of the `BeaconState<E>` because the `EthSpec` type
     /// parameter would be very annoying.
     SszBytes { genesis_state_bytes: Vec<u8> },
-    /// Connects to another Lighthouse instance and reads the genesis state and other data via the
-    /// HTTP API.
-    RemoteNode { server: String, port: Option<u16> },
 }
 
 impl Default for ClientGenesis {