cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix --datadir cli option (#753)

Browse Source 
* Fix datadir bug; fix clippy warnings; update error message

* Cargo fmt

* Update error message
This commit is contained in:
pscott 2020-01-03 01:00:13 +01:00 committed by Paul Hauner
parent 50ea669e1e
commit 39df89521f
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
beacon_node/src/config.rs
View File

@ -27,6 +27,7 @@ type Config = (ClientConfig, Eth2Config, Logger);
/// The output of this function depends primarily upon the given `cli_args`, however it's behaviour /// The output of this function depends primarily upon the given `cli_args`, however it's behaviour
/// may be influenced by other external services like the contents of the file system or the /// may be influenced by other external services like the contents of the file system or the
/// response of some remote server. /// response of some remote server.
#[allow(clippy::cognitive_complexity)]
pub fn get_configs<E: EthSpec>( pub fn get_configs<E: EthSpec>(
cli_args: &ArgMatches, cli_args: &ArgMatches,
mut eth2_config: Eth2Config, mut eth2_config: Eth2Config,
@ -44,7 +45,7 @@ pub fn get_configs<E: EthSpec>(
// directory onto it. // directory onto it.
client_config.data_dir = cli_args client_config.data_dir = cli_args
.value_of("datadir") .value_of("datadir")
.map(PathBuf::from) .map(|path| PathBuf::from(path).join(BEACON_NODE_DIR))
.or_else(|| dirs::home_dir().map(|home| home.join(".lighthouse").join(BEACON_NODE_DIR))) .or_else(|| dirs::home_dir().map(|home| home.join(".lighthouse").join(BEACON_NODE_DIR)))
.unwrap_or_else(|| PathBuf::from(".")); .unwrap_or_else(|| PathBuf::from("."));
@ -300,8 +301,7 @@ fn load_from_datadir(client_config: &mut ClientConfig) -> Result<()> {
.map_or(false, |path| path.exists()) .map_or(false, |path| path.exists())
{ {
return Err( return Err(
"No database found in datadir. Use 'testnet -f' to overwrite the existing \ "No database found in datadir. Please make sure the directory provided is valid, or specify a different `--datadir`."
datadir, or specify a different `--datadir`."
.into(), .into(),
); );
} }
@ -351,11 +351,8 @@ fn init_new_client<E: EthSpec>(
.deposit_contract_deploy_block .deposit_contract_deploy_block
.saturating_sub(client_config.eth1.follow_distance * 2); .saturating_sub(client_config.eth1.follow_distance * 2);
if let Some(boot_nodes) = eth2_testnet_config.boot_enr { if let Some(mut boot_nodes) = eth2_testnet_config.boot_enr {
client_config client_config.network.boot_nodes.append(&mut boot_nodes)
.network
.boot_nodes
.append(&mut boot_nodes.clone())
} }
if let Some(genesis_state) = eth2_testnet_config.genesis_state { if let Some(genesis_state) = eth2_testnet_config.genesis_state {
@ -382,7 +379,7 @@ pub fn create_new_datadir(client_config: &ClientConfig, eth2_config: &Eth2Config
return Err(format!( return Err(format!(
"Data dir already exists at {:?}", "Data dir already exists at {:?}",
client_config.data_dir client_config.data_dir
))?; ));
} }
// Create `datadir` and any non-existing parent directories. // Create `datadir` and any non-existing parent directories.
@ -423,11 +420,9 @@ fn process_testnet_subcommand(
} }
// Deletes the existing datadir. // Deletes the existing datadir.
if cli_args.is_present("force") { if cli_args.is_present("force") && client_config.data_dir.exists() {
if client_config.data_dir.exists() { fs::remove_dir_all(&client_config.data_dir)
fs::remove_dir_all(&client_config.data_dir) .map_err(|e| format!("Unable to delete existing datadir: {:?}", e))?;
.map_err(|e| format!("Unable to delete existing datadir: {:?}", e))?;
}
} }
// Define a percentage of messages that should be propogated, useful for simulating bad network // Define a percentage of messages that should be propogated, useful for simulating bad network