From 79f9372ebbef736e4f695df6367861e45ddc1b02 Mon Sep 17 00:00:00 2001
From: Dave Hrycyszyn <futurechimp@users.noreply.github.com>
Date: Wed, 29 Jan 2020 08:46:09 +0000
Subject: [PATCH] validator: banging structure around a bit

---
 validator/src/main.rs                              | 5 +++--
 validator/src/network/mod.rs                       | 1 +
 validator/src/{ => network}/tendermint_abci/mod.rs | 0
 validator/src/validator/config/mod.rs              | 7 -------
 validator/src/validator/mod.rs                     | 9 +++++++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 validator/src/network/mod.rs
 rename validator/src/{ => network}/tendermint_abci/mod.rs (100%)
 delete mode 100644 validator/src/validator/config/mod.rs

diff --git a/validator/src/main.rs b/validator/src/main.rs
index 5e3701d0f2..d964d8991a 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -1,11 +1,12 @@
-use crate::validator::config::Config;
+use crate::validator::Config;
 use crate::validator::Validator;
 use clap::{App, Arg, ArgMatches, SubCommand};
 use log::{error, info, trace};
+use network::tendermint_abci;
 use std::process;
 use toml;
 
-mod tendermint_abci;
+mod network;
 mod validator;
 
 fn main() {
diff --git a/validator/src/network/mod.rs b/validator/src/network/mod.rs
new file mode 100644
index 0000000000..30db3a456d
--- /dev/null
+++ b/validator/src/network/mod.rs
@@ -0,0 +1 @@
+pub mod tendermint_abci;
diff --git a/validator/src/tendermint_abci/mod.rs b/validator/src/network/tendermint_abci/mod.rs
similarity index 100%
rename from validator/src/tendermint_abci/mod.rs
rename to validator/src/network/tendermint_abci/mod.rs
diff --git a/validator/src/validator/config/mod.rs b/validator/src/validator/config/mod.rs
deleted file mode 100644
index 4ef70b9c7e..0000000000
--- a/validator/src/validator/config/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use serde_derive::Deserialize;
-
-#[derive(Deserialize, Debug)]
-pub struct Config {
-    #[serde(rename(deserialize = "healthcheck"))]
-    pub health_check: healthcheck::config::HealthCheck,
-}
diff --git a/validator/src/validator/mod.rs b/validator/src/validator/mod.rs
index 98c51880e6..d9c220318f 100644
--- a/validator/src/validator/mod.rs
+++ b/validator/src/validator/mod.rs
@@ -1,4 +1,3 @@
-use crate::validator::config::Config;
 use crypto::identity::{
     DummyMixIdentityKeyPair, DummyMixIdentityPrivateKey, DummyMixIdentityPublicKey,
     MixnetIdentityKeyPair, MixnetIdentityPrivateKey, MixnetIdentityPublicKey,
@@ -7,7 +6,13 @@ use healthcheck::HealthChecker;
 use log::debug;
 use tokio::runtime::Runtime;
 
-pub mod config;
+use serde_derive::Deserialize;
+
+#[derive(Deserialize, Debug)]
+pub struct Config {
+    #[serde(rename(deserialize = "healthcheck"))]
+    pub health_check: healthcheck::config::HealthCheck,
+}
 
 // allow for a generic validator
 pub struct Validator<IDPair, Priv, Pub>