From 0aa05158c969d3ae840f8cfea9d8ce43416a7437 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 11 Apr 2019 10:02:20 -0700
Subject: [PATCH] Adjust noop/failure program names to be consistent with all
 other programs

---
 Cargo.lock                                | 4 ++--
 programs/failure_program/Cargo.toml       | 4 ++--
 programs/failure_program/tests/failure.rs | 2 +-
 programs/noop_program/Cargo.toml          | 4 ++--
 programs/noop_program/tests/noop.rs       | 2 +-
 scripts/cargo-install-all.sh              | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f8f08e173..8f780c098 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2338,7 +2338,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "solana-failure"
+name = "solana-failure-program"
 version = "0.13.0"
 dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2491,7 +2491,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "solana-noop"
+name = "solana-noop-program"
 version = "0.13.0"
 dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/programs/failure_program/Cargo.toml b/programs/failure_program/Cargo.toml
index 7d65c9fd2..bc37f4a42 100644
--- a/programs/failure_program/Cargo.toml
+++ b/programs/failure_program/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "solana-failure"
+name = "solana-failure-program"
 version = "0.13.0"
 description = "Solana failure program"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
@@ -16,6 +16,6 @@ log = "0.4.2"
 solana-runtime = { path = "../../runtime", version = "0.13.0" }
 
 [lib]
-name = "failure"
+name = "solana_failure_program"
 crate-type = ["cdylib"]
 
diff --git a/programs/failure_program/tests/failure.rs b/programs/failure_program/tests/failure.rs
index da8c8d42d..2ece7ff4b 100644
--- a/programs/failure_program/tests/failure.rs
+++ b/programs/failure_program/tests/failure.rs
@@ -14,7 +14,7 @@ fn test_program_native_failure() {
     let bank = Bank::new(&genesis_block);
     let bank_client = BankClient::new(&bank);
 
-    let program = "failure".as_bytes().to_vec();
+    let program = "solana_failure_program".as_bytes().to_vec();
     let program_id = load_program(&bank_client, &alice_keypair, &native_loader::id(), program);
 
     // Call user program
diff --git a/programs/noop_program/Cargo.toml b/programs/noop_program/Cargo.toml
index 8e18e4f80..9d27fc46c 100644
--- a/programs/noop_program/Cargo.toml
+++ b/programs/noop_program/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "solana-noop"
+name = "solana-noop-program"
 version = "0.13.0"
 description = "Solana noop program"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
@@ -17,6 +17,6 @@ log = "0.4.2"
 solana-runtime = { path = "../../runtime", version = "0.13.0" }
 
 [lib]
-name = "noop"
+name = "solana_noop_program"
 crate-type = ["cdylib"]
 
diff --git a/programs/noop_program/tests/noop.rs b/programs/noop_program/tests/noop.rs
index 64f744245..d52067173 100644
--- a/programs/noop_program/tests/noop.rs
+++ b/programs/noop_program/tests/noop.rs
@@ -14,7 +14,7 @@ fn test_program_native_noop() {
     let bank = Bank::new(&genesis_block);
     let bank_client = BankClient::new(&bank);
 
-    let program = "noop".as_bytes().to_vec();
+    let program = "solana_noop_program".as_bytes().to_vec();
     let program_id = load_program(&bank_client, &alice_keypair, &native_loader::id(), program);
 
     // Call user program
diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh
index ba8a2ffe8..8a1a0b65c 100755
--- a/scripts/cargo-install-all.sh
+++ b/scripts/cargo-install-all.sh
@@ -50,7 +50,7 @@ for crate in "${BIN_CRATES[@]}"; do
 done
 
 for dir in programs/*; do
-  for program in echo target/release/deps/lib{,solana_}"$(basename "$dir")"{,_program}.{so,dylib,dll}; do
+  for program in echo target/release/deps/libsolana_"$(basename "$dir")".{so,dylib,dll}; do
     if [[ -f $program ]]; then
       mkdir -p "$installDir/bin/deps"
       rm -f "$installDir/bin/deps/$(basename "$program")"