Adjust noop/failure program names to be consistent with all other programs

This commit is contained in:
Michael Vines 2019-04-11 10:02:20 -07:00
parent 787dc5748a
commit 0aa05158c9
6 changed files with 9 additions and 9 deletions

4
Cargo.lock generated
View File

@ -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)",

View File

@ -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"]

View File

@ -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

View File

@ -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"]

View File

@ -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

View File

@ -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")"