Move ValidatorDirectory into validator_client

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" }

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;
 

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" }

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};

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;