From c5071afdbca0881a7daa4d969c38e67e118bdf15 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Tue, 19 Nov 2019 11:01:49 +1100
Subject: [PATCH] Move ValidatorDirectory into validator_client

---
 account_manager/Cargo.toml                                | 1 +
 account_manager/src/lib.rs                                | 3 +--
 validator_client/Cargo.toml                               | 8 +++++++-
 validator_client/src/config.rs                            | 2 +-
 validator_client/src/lib.rs                               | 1 +
 .../src/validator_directory.rs                            | 0
 6 files changed, 11 insertions(+), 4 deletions(-)
 rename account_manager/src/validator.rs => validator_client/src/validator_directory.rs (100%)

diff --git a/account_manager/Cargo.toml b/account_manager/Cargo.toml
index b9b4f8b4bd..efbf9beb00 100644
--- a/account_manager/Cargo.toml
+++ b/account_manager/Cargo.toml
@@ -21,3 +21,4 @@ libc = "0.2.65"
 eth2_ssz = { path = "../eth2/utils/ssz" }
 eth2_ssz_derive = { path = "../eth2/utils/ssz_derive" }
 hex = "0.4"
+validator_client = { path = "../validator_client" }
diff --git a/account_manager/src/lib.rs b/account_manager/src/lib.rs
index 58d2427f2d..7c19e953c0 100644
--- a/account_manager/src/lib.rs
+++ b/account_manager/src/lib.rs
@@ -1,5 +1,4 @@
 mod cli;
-pub mod validator;
 
 use clap::ArgMatches;
 use environment::RuntimeContext;
@@ -7,7 +6,7 @@ use slog::{crit, info};
 use std::fs;
 use std::path::PathBuf;
 use types::{ChainSpec, EthSpec};
-use validator::{ValidatorDirectory, ValidatorDirectoryBuilder};
+use validator_client::validator_directory::{ValidatorDirectory, ValidatorDirectoryBuilder};
 
 pub use cli::cli_app;
 
diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml
index f824b9975a..1d6dadb4a0 100644
--- a/validator_client/Cargo.toml
+++ b/validator_client/Cargo.toml
@@ -8,6 +8,9 @@ edition = "2018"
 name = "validator_client"
 path = "src/lib.rs"
 
+[dev-dependencies]
+tempdir = "0.3"
+
 [dependencies]
 eth2_ssz = "0.1.2"
 eth2_config = { path = "../eth2/utils/eth2_config" }
@@ -36,5 +39,8 @@ environment = { path = "../lighthouse/environment" }
 parking_lot = "0.7"
 exit-future = "0.1.4"
 libc = "0.2.65"
-account_manager = { path = "../account_manager" }
 lazy_static = "1.4.0"
+eth2_ssz_derive = { path = "../eth2/utils/ssz_derive" }
+hex = "0.4"
+deposit_contract = { path = "../eth2/utils/deposit_contract" }
+bls = { path = "../eth2/utils/bls" }
diff --git a/validator_client/src/config.rs b/validator_client/src/config.rs
index 539e95bef5..336585788f 100644
--- a/validator_client/src/config.rs
+++ b/validator_client/src/config.rs
@@ -1,4 +1,4 @@
-use account_manager::validator::ValidatorDirectory;
+use crate::validator_directory::ValidatorDirectory;
 use bincode;
 use clap::ArgMatches;
 use serde_derive::{Deserialize, Serialize};
diff --git a/validator_client/src/lib.rs b/validator_client/src/lib.rs
index 175ee4793e..930f35c32a 100644
--- a/validator_client/src/lib.rs
+++ b/validator_client/src/lib.rs
@@ -6,6 +6,7 @@ mod duties;
 mod error;
 mod service;
 mod signer;
+pub mod validator_directory;
 
 pub use cli::cli_app;
 pub use config::Config;
diff --git a/account_manager/src/validator.rs b/validator_client/src/validator_directory.rs
similarity index 100%
rename from account_manager/src/validator.rs
rename to validator_client/src/validator_directory.rs