validator: banging structure around a bit

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() {

validator/src/network/mod.rs

@@ -0,0 +1 @@
+pub mod tendermint_abci;

validator/src/validator/config/mod.rs

@@ -1,7 +0,0 @@
-use serde_derive::Deserialize;
-
-#[derive(Deserialize, Debug)]
-pub struct Config {
-    #[serde(rename(deserialize = "healthcheck"))]
-    pub health_check: healthcheck::config::HealthCheck,
-}

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>