Remove more hardocoded values

sigp · Sep 1, 2020 · 4ddbbfe · 4ddbbfe
1 parent 4170e4c
commit 4ddbbfe
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lcli/Cargo.toml b/lcli/Cargo.toml
@@ -35,3 +35,4 @@ validator_dir = { path = "../common/validator_dir", features = ["insecure_keys"]
 rand = "0.7.2"
 eth2_keystore = { path = "../crypto/eth2_keystore" }
 lighthouse_version = { path = "../common/lighthouse_version" }
+directory = { path = "../common/directory" }
diff --git a/lcli/src/eth1_genesis.rs b/lcli/src/eth1_genesis.rs
@@ -20,7 +20,7 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches<'_>) -> Res
         .and_then(|dir| dir.parse::<PathBuf>().map_err(|_| ()))
         .unwrap_or_else(|_| {
             dirs::home_dir()
-                .map(|home| home.join(".lighthouse").join("testnet"))
+                .map(|home| home.join(directory::DEFAULT_ROOT_DIR).join("testnet"))
                 .expect("should locate home directory")
         });
 

diff --git a/lcli/src/interop_genesis.rs b/lcli/src/interop_genesis.rs
@@ -31,7 +31,7 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
         .and_then(|dir| dir.parse::<PathBuf>().map_err(|_| ()))
         .unwrap_or_else(|_| {
             dirs::home_dir()
-                .map(|home| home.join(".lighthouse").join("testnet"))
+                .map(|home| home.join(directory::DEFAULT_ROOT_DIR).join("testnet"))
                 .expect("should locate home directory")
         });
 

diff --git a/lcli/src/new_testnet.rs b/lcli/src/new_testnet.rs
@@ -10,7 +10,7 @@ pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
     let testnet_dir_path = parse_path_with_default_in_home_dir(
         matches,
         "testnet-dir",
-        PathBuf::from(".lighthouse/testnet"),
+        PathBuf::from(directory::DEFAULT_ROOT_DIR).join("testnet"),
     )?;
     let deposit_contract_address: Address = parse_required(matches, "deposit-contract-address")?;
     let deposit_contract_deploy_block = parse_required(matches, "deposit-contract-deploy-block")?;