Fix db paths when datadir is relative (#2682)

This commit is contained in:
Pawan Dhananjay
2021-10-06 19:22:19 +05:30
committed by Paul Hauner
parent 67a6f91df6
commit aa1d57aa55
2 changed files with 15 additions and 34 deletions

View File

@@ -36,20 +36,12 @@ pub fn get_config<E: EthSpec>(
// If necessary, remove any existing database and configuration
if client_config.data_dir.exists() && cli_args.is_present("purge-db") {
// Remove the chain_db.
let chain_db = client_config.get_db_path().ok_or("Failed to get db_path")?;
if chain_db.exists() {
fs::remove_dir_all(chain_db)
.map_err(|err| format!("Failed to remove chain_db: {}", err))?;
}
fs::remove_dir_all(client_config.get_db_path())
.map_err(|err| format!("Failed to remove chain_db: {}", err))?;
// Remove the freezer db.
let freezer_db = client_config
.get_freezer_db_path()
.ok_or("Failed to get freezer db path")?;
if freezer_db.exists() {
fs::remove_dir_all(freezer_db)
.map_err(|err| format!("Failed to remove chain_db: {}", err))?;
}
fs::remove_dir_all(client_config.get_freezer_db_path())
.map_err(|err| format!("Failed to remove chain_db: {}", err))?;
}
// Create `datadir` and any non-existing parent directories.