From 7e4af9382ea3bd1cdefd07442dbe60f59cedde0d Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 12 Dec 2018 14:28:36 -0800
Subject: [PATCH] Move solana-upload-perf into upload-perf/

---
 Cargo.lock                                  |  8 ++++++++
 Cargo.toml                                  |  5 +----
 ci/test-bench.sh                            |  2 +-
 upload-perf/Cargo.toml                      | 17 +++++++++++++++++
 {src/bin => upload-perf/src}/upload-perf.rs |  0
 5 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 upload-perf/Cargo.toml
 rename {src/bin => upload-perf/src}/upload-perf.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index a56d73cd4c..a431fc79ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2074,6 +2074,14 @@ dependencies = [
  "solana-sdk 0.11.0",
 ]
 
+[[package]]
+name = "solana-upload-perf"
+version = "0.11.0"
+dependencies = [
+ "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana-metrics 0.11.0",
+]
+
 [[package]]
 name = "solana-vote-program"
 version = "0.11.0"
diff --git a/Cargo.toml b/Cargo.toml
index 0c7c6bb4af..04ffd0290e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,10 +10,6 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 license = "Apache-2.0"
 edition = "2018"
 
-[[bin]]
-name = "solana-upload-perf"
-path = "src/bin/upload-perf.rs"
-
 [[bin]]
 required-features = ["bench_streamer"]
 name = "solana-bench-streamer"
@@ -153,5 +149,6 @@ members = [
     "programs/native/noop",
     "programs/native/vote",
     "sdk",
+    "upload-perf",
     "vote-signer",
 ]
diff --git a/ci/test-bench.sh b/ci/test-bench.sh
index 4935fbf919..db11862fd0 100755
--- a/ci/test-bench.sh
+++ b/ci/test-bench.sh
@@ -40,6 +40,6 @@ _ cargo bench --features=unstable --verbose -- -Z unstable-options --format=json
   cargo bench --verbose --features="bpf_c" -- -Z unstable-options --format=json --nocapture | tee -a ../../../"$BENCH_FILE"
 )
 
-_ cargo run --release --bin solana-upload-perf -- "$BENCH_FILE" "$TARGET_BRANCH" "$UPLOAD_METRICS" > "$BENCH_ARTIFACT"
+_ cargo run --release --package solana-upload-perf -- "$BENCH_FILE" "$TARGET_BRANCH" "$UPLOAD_METRICS" > "$BENCH_ARTIFACT"
 
 upload_ci_artifact "$BENCH_ARTIFACT"
diff --git a/upload-perf/Cargo.toml b/upload-perf/Cargo.toml
new file mode 100644
index 0000000000..a3e586825b
--- /dev/null
+++ b/upload-perf/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "solana-upload-perf"
+version = "0.11.0"
+description = "Metrics Upload Utility"
+authors = ["Solana Maintainers <maintainers@solana.com>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+edition = "2018"
+
+[dependencies]
+serde_json = "1.0.10"
+solana-metrics = { path = "../metrics", version = "0.11.0" }
+
+[[bin]]
+name = "solana-upload-perf"
+path = "src/upload-perf.rs"
+
diff --git a/src/bin/upload-perf.rs b/upload-perf/src/upload-perf.rs
similarity index 100%
rename from src/bin/upload-perf.rs
rename to upload-perf/src/upload-perf.rs