Merge branch 'master' into eth1-deploy

beacon_node/src/cli.rs

@@ -17,6 +17,14 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                 .takes_value(true)
                 .global(true)
         )
+        .arg(
+            Arg::with_name("freezer-dir")
+                .long("freezer-dir")
+                .value_name("DIR")
+                .help("Data directory for the freezer database.")
+                .takes_value(true)
+                .global(true)
+        )
         /*
          * Network parameters.
          */

beacon_node/src/config.rs

@@ -358,7 +358,7 @@ impl ConfigBuilder {
     ///
     /// - Client config
     /// - Eth2 config
-    /// - The entire database directory
+    /// - All database directories
     pub fn clean_datadir(&mut self) -> Result<()> {
         let backup_dir = {
             let mut s = String::from("backup_");
@@ -386,10 +386,8 @@ impl ConfigBuilder {
 
         move_to_backup_dir(&self.client_config.data_dir.join(CLIENT_CONFIG_FILENAME))?;
         move_to_backup_dir(&self.client_config.data_dir.join(ETH2_CONFIG_FILENAME))?;
-
-        if let Some(db_path) = self.client_config.db_path() {
-            move_to_backup_dir(&db_path)?;
-        }
+        move_to_backup_dir(&self.client_config.create_db_path()?)?;
+        move_to_backup_dir(&self.client_config.create_freezer_db_path()?)?;
 
         Ok(())
     }
@@ -527,7 +525,7 @@ impl ConfigBuilder {
     pub fn write_configs_to_new_datadir(&mut self) -> Result<()> {
         let db_exists = self
             .client_config
-            .db_path()
+            .get_db_path()
             .map(|d| d.exists())
             .unwrap_or_else(|| false);
 
@@ -583,19 +581,22 @@ impl ConfigBuilder {
         //
         // For now we return an error. In the future we may decide to boot a default (e.g.,
         // public testnet or mainnet).
-        if !self.client_config.data_dir.exists() {
+        if !self
+            .client_config
+            .get_data_dir()
+            .map_or(false, |d| d.exists())
+        {
             return Err(
                 "No datadir found. Either create a new testnet or specify a different `--datadir`."
                     .into(),
             );
         }
 
-        // If there is a path to a databse in the config, ensure it exists.
+        // If there is a path to a database in the config, ensure it exists.
         if !self
             .client_config
-            .db_path()
-            .map(|path| path.exists())
-            .unwrap_or_else(|| true)
+            .get_db_path()
+            .map_or(false, |path| path.exists())
         {
             return Err(
                 "No database found in datadir. Use 'testnet -f' to overwrite the existing \

beacon_node/src/lib.rs

@@ -19,13 +19,14 @@ use environment::RuntimeContext;
 use futures::{Future, IntoFuture};
 use slog::{info, warn};
 use std::ops::{Deref, DerefMut};
-use store::DiskStore;
+use store::{migrate::BackgroundMigrator, DiskStore};
 use types::EthSpec;
 
 /// A type-alias to the tighten the definition of a production-intended `Client`.
 pub type ProductionClient<E> = Client<
     Witness<
         DiskStore,
+        BackgroundMigrator<E>,
         SystemTimeSlotClock,
         ThreadSafeReducedTree<DiskStore, E>,
         CachingEth1Backend<E, DiskStore>,
@@ -80,15 +81,17 @@ impl<E: EthSpec> ProductionBeaconNode<E> {
         let client_genesis = client_config.genesis.clone();
         let log = context.log.clone();
 
-        client_config
-            .db_path()
-            .ok_or_else(|| "Unable to access database path".to_string())
+        let db_path_res = client_config.create_db_path();
+        let freezer_db_path_res = client_config.create_freezer_db_path();
+
+        db_path_res
             .into_future()
             .and_then(move |db_path| {
                 Ok(ClientBuilder::new(context.eth_spec_instance.clone())
                     .runtime_context(context)
-                    .disk_store(&db_path)?
-                    .chain_spec(spec))
+                    .chain_spec(spec)
+                    .disk_store(&db_path, &freezer_db_path_res?)?
+                    .background_migrator()?)
             })
             .and_then(move |builder| {
                 builder.beacon_chain_builder(client_genesis, genesis_eth1_config)