Fix #6209 - introduce standalone dir crate

* created the dir crate in util
* moved code from ethstore/src/dir/paths.rs to dir crate
* rename dir module in ethstore to accounts_dir to distinguish it
  from the dir crate
* changes after @tomusdrw on #6952

ethstore/src/accounts_dir/disk.rs

@@ -290,8 +290,7 @@ mod test {
 	extern crate tempdir;
 
 	use std::{env, fs};
-	use super::RootDiskDirectory;
-	use dir::{KeyDirectory, VaultKey};
+	use super::{KeyDirectory, RootDiskDirectory, VaultKey};
 	use account::SafeAccount;
 	use ethkey::{Random, Generator};
 	use self::tempdir::TempDir;

ethstore/src/accounts_dir/mod.rs

@@ -22,7 +22,6 @@ use {SafeAccount, Error};
 mod disk;
 mod memory;
 mod vault;
-pub mod paths;
 
 /// `VaultKeyDirectory::set_key` error
 #[derive(Debug)]

ethstore/src/accounts_dir/vault.rs

@@ -284,7 +284,7 @@ mod test {
 	use std::fs;
 	use std::io::Write;
 	use std::path::PathBuf;
-	use dir::VaultKey;
+	use super::VaultKey;
 	use super::{VAULT_FILE_NAME, check_vault_name, make_vault_dir_path, create_vault_file, read_vault_file, VaultDiskDirectory};
 	use self::tempdir::TempDir;
 

ethstore/src/dir/paths.rs

@@ -1,96 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Common tools paths.
-
-use std::env;
-use std::path::PathBuf;
-
-fn home() -> PathBuf {
-	env::home_dir().expect("Failed to get home dir")
-}
-
-/// Geth path
-pub fn geth(testnet: bool) -> PathBuf {
-	let mut base = geth_base();
-	if testnet {
-		base.push("testnet");
-	}
-	base.push("keystore");
-	base
-}
-
-/// Parity path for specific chain
-pub fn parity(chain: &str) -> PathBuf {
-	let mut base = parity_base();
-	base.push(chain);
-	base
-}
-
-#[cfg(target_os = "macos")]
-fn parity_base() -> PathBuf {
-	let mut home = home();
-	home.push("Library");
-	home.push("Application Support");
-	home.push("io.parity.ethereum");
-	home.push("keys");
-	home
-}
-
-#[cfg(windows)]
-fn parity_base() -> PathBuf {
-	let mut home = home();
-	home.push("AppData");
-	home.push("Roaming");
-	home.push("Parity");
-	home.push("Ethereum");
-	home.push("keys");
-	home
-}
-
-#[cfg(not(any(target_os = "macos", windows)))]
-fn parity_base() -> PathBuf {
-	let mut home = home();
-	home.push(".local");
-	home.push("share");
-	home.push("io.parity.ethereum");
-	home.push("keys");
-	home
-}
-
-#[cfg(target_os = "macos")]
-fn geth_base() -> PathBuf {
-	let mut home = home();
-	home.push("Library");
-	home.push("Ethereum");
-	home
-}
-
-#[cfg(windows)]
-fn geth_base() -> PathBuf {
-	let mut home = home();
-	home.push("AppData");
-	home.push("Roaming");
-	home.push("Ethereum");
-	home
-}
-
-#[cfg(not(any(target_os = "macos", windows)))]
-fn geth_base() -> PathBuf {
-	let mut home = home();
-	home.push(".ethereum");
-	home
-}

ethstore/src/ethstore.rs

@@ -23,7 +23,7 @@ use std::time::{Instant, Duration};
 use crypto::KEY_ITERATIONS;
 use random::Random;
 use ethkey::{self, Signature, Address, Message, Secret, Public, KeyPair, ExtendedKeyPair};
-use dir::{KeyDirectory, VaultKeyDirectory, VaultKey, SetKeyError};
+use accounts_dir::{KeyDirectory, VaultKeyDirectory, VaultKey, SetKeyError};
 use account::SafeAccount;
 use presale::PresaleWallet;
 use json::{self, Uuid, OpaqueKeyFile};
@@ -684,7 +684,7 @@ impl SimpleSecretStore for EthMultiStore {
 mod tests {
 	extern crate tempdir;
 
-	use dir::{KeyDirectory, MemoryDirectory, RootDiskDirectory};
+	use accounts_dir::{KeyDirectory, MemoryDirectory, RootDiskDirectory};
 	use ethkey::{Random, Generator, KeyPair};
 	use secret_store::{SimpleSecretStore, SecretStore, SecretVaultRef, StoreAccountRef, Derivation};
 	use super::{EthStore, EthMultiStore};

ethstore/src/import.rs

@@ -19,7 +19,8 @@ use std::path::Path;
 use std::fs;
 
 use ethkey::Address;
-use dir::{paths, KeyDirectory, RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
+use accounts_dir::{KeyDirectory, RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
+use dir;
 use Error;
 
 /// Import an account from a file.
@@ -54,7 +55,7 @@ pub fn import_accounts(src: &KeyDirectory, dst: &KeyDirectory) -> Result<Vec<Add
 
 /// Provide a `HashSet` of all accounts available for import from the Geth keystore.
 pub fn read_geth_accounts(testnet: bool) -> Vec<Address> {
-	RootDiskDirectory::at(paths::geth(testnet))
+	RootDiskDirectory::at(dir::geth(testnet))
 		.load()
 		.map(|d| d.into_iter().map(|a| a.address).collect())
 		.unwrap_or_else(|_| Vec::new())
@@ -62,7 +63,7 @@ pub fn read_geth_accounts(testnet: bool) -> Vec<Address> {
 
 /// Import specific `desired` accounts from the Geth keystore into `dst`.
 pub fn import_geth_accounts(dst: &KeyDirectory, desired: HashSet<Address>, testnet: bool) -> Result<Vec<Address>, Error> {
-	let src = RootDiskDirectory::at(paths::geth(testnet));
+	let src = RootDiskDirectory::at(dir::geth(testnet));
 	let accounts = src.load()?;
 	let existing_accounts = dst.load()?.into_iter().map(|a| a.address).collect::<HashSet<_>>();
 

ethstore/src/lib.rs

@@ -19,6 +19,7 @@
 #![warn(missing_docs)]
 
 extern crate crypto as rcrypto;
+extern crate dir;
 extern crate itertools;
 extern crate libc;
 extern crate parking_lot;
@@ -41,7 +42,7 @@ extern crate log;
 #[macro_use]
 extern crate serde_derive;
 
-pub mod dir;
+pub mod accounts_dir; 
 pub mod ethkey;
 
 mod account;