From 647e5d76b0f80c37dfe76ba743dd4d01e6fee9ec Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 12 Dec 2018 16:59:29 -0800
Subject: [PATCH] Move solana-fullnode into fullnode/

---
 Cargo.lock                            | 14 ++++++++++++++
 Cargo.toml                            |  5 +----
 ci/publish-crate.sh                   |  1 +
 fullnode/Cargo.toml                   | 22 ++++++++++++++++++++++
 {src/bin => fullnode/src}/fullnode.rs |  0
 scripts/cargo-install-all.sh          |  1 +
 6 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 fullnode/Cargo.toml
 rename {src/bin => fullnode/src}/fullnode.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index a431fc79b..a96780a4f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1843,6 +1843,20 @@ dependencies = [
  "solana-sdk 0.11.0",
 ]
 
+[[package]]
+name = "solana-fullnode"
+version = "0.1.0"
+dependencies = [
+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana 0.11.0",
+ "solana-drone 0.11.0",
+ "solana-metrics 0.11.0",
+ "solana-sdk 0.11.0",
+]
+
 [[package]]
 name = "solana-jsonrpc-core"
 version = "0.3.0"
diff --git a/Cargo.toml b/Cargo.toml
index 04ffd0290..cc5003f46 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,10 +24,6 @@ required-features = ["chacha"]
 name = "solana-replicator"
 path = "src/bin/replicator.rs"
 
-[[bin]]
-name = "solana-fullnode"
-path = "src/bin/fullnode.rs"
-
 [[bin]]
 name = "solana-fullnode-config"
 path = "src/bin/fullnode-config.rs"
@@ -140,6 +136,7 @@ members = [
     "drone",
     "keygen",
     "metrics",
+    "fullnode",
     "programs/bpf/rust/noop",
     "programs/native/bpf_loader",
     "programs/native/budget",
diff --git a/ci/publish-crate.sh b/ci/publish-crate.sh
index 2d65eb19e..a55fc62e6 100755
--- a/ci/publish-crate.sh
+++ b/ci/publish-crate.sh
@@ -17,6 +17,7 @@ CRATES=(
   drone
   programs/native/{budget,bpf_loader,lua_loader,native_loader,noop,system,vote}
   .
+  fullnode
 )
 
 
diff --git a/fullnode/Cargo.toml b/fullnode/Cargo.toml
new file mode 100644
index 000000000..44608f8d4
--- /dev/null
+++ b/fullnode/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+authors = ["Solana Maintainers <maintainers@solana.com>"]
+edition = "2018"
+name = "solana-fullnode"
+version = "0.1.0"
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "http://solana.com/"
+
+[dependencies]
+clap = "2.32.0"
+log = "0.4.2"
+rayon = "1.0.3"
+serde_json = "1.0.10"
+solana = { path = "..", version = "0.11.0" }
+solana-drone = { path = "../drone", version = "0.11.0" }
+solana-metrics = { path = "../metrics", version = "0.11.0" }
+solana-sdk = { path = "../sdk", version = "0.11.0" }
+
+[[bin]]
+name = "solana-fullnode"
+path = "src/fullnode.rs"
diff --git a/src/bin/fullnode.rs b/fullnode/src/fullnode.rs
similarity index 100%
rename from src/bin/fullnode.rs
rename to fullnode/src/fullnode.rs
diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh
index bc5b09881..31f887f94 100755
--- a/scripts/cargo-install-all.sh
+++ b/scripts/cargo-install-all.sh
@@ -9,3 +9,4 @@ set -x
 cargo install --path drone "$@"
 cargo install --path keygen "$@"
 cargo install --path . "$@"
+cargo install --path fullnode "$@"