refactor grin crate into separate modules (#955)

src/bin/client.rs

@@ -18,7 +18,7 @@ use std::net::SocketAddr;
 
 use api;
 use p2p;
-use grin::ServerConfig;
+use servers::ServerConfig;
 
 pub fn show_status(config: &ServerConfig) {
 	println!();

src/bin/grin.rs

@@ -28,7 +28,7 @@ extern crate time;
 extern crate grin_api as api;
 extern crate grin_config as config;
 extern crate grin_core as core;
-extern crate grin_grin as grin;
+extern crate grin_servers as servers;
 extern crate grin_keychain as keychain;
 extern crate grin_p2p as p2p;
 extern crate grin_util as util;
@@ -84,7 +84,7 @@ fn log_build_info() {
 }
 
 /// wrap below to allow UI to clean up on stop
-fn start_server(config: grin::ServerConfig) {
+fn start_server(config: servers::ServerConfig) {
 	start_server_tui(config);
 	// Just kill process for now, otherwise the process
 	// hangs around until sigint because the API server
@@ -95,12 +95,12 @@ fn start_server(config: grin::ServerConfig) {
 	exit(0);
 }
 
-fn start_server_tui(config: grin::ServerConfig) {
+fn start_server_tui(config: servers::ServerConfig) {
 	// Run the UI controller.. here for now for simplicity to access
 	// everything it might need
 	if config.run_tui.is_some() && config.run_tui.unwrap() {
 		println!("Starting GRIN in UI mode...");
-		grin::Server::start(config, |serv: Arc<grin::Server>| {
+		servers::Server::start(config, |serv: Arc<servers::Server>| {
 			let _ = thread::Builder::new()
 				.name("ui".to_string())
 				.spawn(move || {
@@ -111,7 +111,7 @@ fn start_server_tui(config: grin::ServerConfig) {
 				});
 		}).unwrap();
 	} else {
-		grin::Server::start(config, |_| {}).unwrap();
+		servers::Server::start(config, |_| {}).unwrap();
 	}
 }
 
@@ -412,7 +412,7 @@ fn server_command(server_args: Option<&ArgMatches>, mut global_config: GlobalCon
 		}
 
 		if let Some(seeds) = a.values_of("seed") {
-			server_config.seeding_type = grin::Seeding::List;
+			server_config.seeding_type = servers::Seeding::List;
 			server_config.seeds = Some(seeds.map(|s| s.to_string()).collect());
 		}
 	}

src/bin/tui/mining.rs

@@ -29,7 +29,7 @@ use tui::chrono::prelude::*;
 use tui::constants::*;
 use tui::types::*;
 
-use grin::stats::*;
+use servers::{ServerStats, DiffBlock};
 use tui::pow::cuckoo_miner::CuckooMinerDeviceStats;
 use tui::table::{TableView, TableViewItem};
 

src/bin/tui/peers.rs

@@ -16,7 +16,7 @@
 
 use std::cmp::Ordering;
 
-use grin::stats::{PeerStats, ServerStats};
+use servers::{PeerStats, ServerStats};
 
 use cursive::Cursive;
 use cursive::view::View;

src/bin/tui/status.rs

@@ -23,7 +23,7 @@ use cursive::traits::*;
 use tui::constants::*;
 use tui::types::*;
 
-use grin::ServerStats;
+use servers::ServerStats;
 
 pub struct TUIStatusView;
 

src/bin/tui/types.rs

@@ -16,7 +16,7 @@
 
 use cursive::Cursive;
 use cursive::view::View;
-use grin::stats::ServerStats;
+use servers::ServerStats;
 
 /// Main message struct to communicate between the UI and
 /// the main process

src/bin/tui/ui.rs

@@ -28,7 +28,7 @@ use cursive::views::{LinearLayout, Panel, StackView, TextView, ViewBox};
 use cursive::direction::Orientation;
 use cursive::traits::*;
 
-use grin::Server;
+use servers::Server;
 
 use tui::{menu, mining, peers, status, version};
 use tui::types::*;

src/bin/tui/version.rs

@@ -23,7 +23,7 @@ use cursive::traits::*;
 use tui::constants::*;
 use tui::types::*;
 
-use grin::ServerStats;
+use servers::ServerStats;
 use info_strings;
 
 pub struct TUIVersionView;