gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Rename programs to instruction_processors (#3789)" (#3824)

Browse Source 
This reverts commit 34344982a9.
This commit is contained in:
Greg Fitzgerald
2019-04-17 15:05:49 -06:00
committed by GitHub
parent 083090817a
commit 51a2988bb2
93 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Cargo.toml
View File

@@ -14,28 +14,28 @@ members = [
"ledger-tool",
"logger",
"metrics",
"instruction-processors/bpf",
"instruction-processors/bpf_loader",
"instruction-processors/budget_api",
"instruction-processors/budget_program",
"instruction-processors/config_api",
"instruction-processors/config_program",
"instruction-processors/exchange_api",
"instruction-processors/exchange_program",
"instruction-processors/token_api",
"instruction-processors/token_program",
"instruction-processors/failure_program",
"instruction-processors/noop_program",
"instruction-processors/stake_api",
"instruction-processors/stake_program",
"instruction-processors/storage_api",
"instruction-processors/storage_program",
"instruction-processors/vote_api",
"instruction-processors/vote_program",
"programs/bpf",
"programs/bpf_loader",
"programs/budget_api",
"programs/budget_program",
"programs/config_api",
"programs/config_program",
"programs/exchange_api",
"programs/exchange_program",
"programs/token_api",
"programs/token_program",
"programs/failure_program",
"programs/noop_program",
"programs/stake_api",
"programs/stake_program",
"programs/storage_api",
"programs/storage_program",
"programs/vote_api",
"programs/vote_program",
"replicator",
"sdk",
"upload-perf",
"vote-signer",
"wallet",
]
exclude = ["instruction-processors/bpf/rust/noop"]
exclude = ["programs/bpf/rust/noop"]

4
ci/publish-crate.sh
View File

@@ -19,9 +19,9 @@ CRATES=(
metrics
client
drone
instruction-processors/{budget_api,config_api,storage_api,token_api,vote_api}
programs/{budget_api,config_api,storage_api,token_api,vote_api}
runtime
instruction-processors/{budget,bpf_loader,config,vote,storage,token,vote}
programs/{budget,bpf_loader,config,vote,storage,token,vote}
vote-signer
core
fullnode

2
ci/test-bench.sh
View File

@@ -56,7 +56,7 @@ _ cargo +$rust_nightly bench --manifest-path core/Cargo.toml ${V:+--verbose} \
-- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
# Run bpf benches
_ cargo +$rust_nightly bench --manifest-path instruction-processors/bpf/Cargo.toml ${V:+--verbose} --features=bpf_c \
_ cargo +$rust_nightly bench --manifest-path programs/bpf/Cargo.toml ${V:+--verbose} --features=bpf_c \
-- -Z unstable-options --format=json --nocapture | tee -a "$BENCH_FILE"

8
ci/test-stable.sh
View File

@@ -37,7 +37,7 @@ test-stable-perf)
Cargo.toml$ \
ci/test-stable-perf.sh \
ci/test-stable.sh \
^instruction-processors/ \
^programs/ \
^sdk/ \
|| {
annotate --style info \
@@ -46,10 +46,10 @@ test-stable-perf)
}
# BPF program tests
_ make -C instruction-processors/bpf/c tests
_ instruction-processors/bpf/rust/noop/build.sh # Must be built out of band
_ make -C programs/bpf/c tests
_ programs/bpf/rust/noop/build.sh # Must be built out of band
_ cargo +"$rust_stable" test \
--manifest-path instruction-processors/bpf/Cargo.toml \
--manifest-path programs/bpf/Cargo.toml \
--no-default-features --features=bpf_c,bpf_rust
# Run root package tests with these features

10
core/Cargo.toml
View File

@@ -46,7 +46,7 @@ rocksdb = "0.11.0"
serde = "1.0.89"
serde_derive = "1.0.88"
serde_json = "1.0.39"
solana-budget-api = { path = "../instruction-processors/budget_api", version = "0.14.0" }
solana-budget-api = { path = "../programs/budget_api", version = "0.14.0" }
solana-client = { path = "../client", version = "0.14.0" }
solana-drone = { path = "../drone", version = "0.14.0" }
solana-kvstore = { path = "../kvstore", version = "0.14.0" , optional = true }
@@ -55,8 +55,8 @@ solana-metrics = { path = "../metrics", version = "0.14.0" }
solana-netutil = { path = "../netutil", version = "0.14.0" }
solana-runtime = { path = "../runtime", version = "0.14.0" }
solana-sdk = { path = "../sdk", version = "0.14.0" }
solana-storage-api = { path = "../instruction-processors/storage_api", version = "0.14.0" }
solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.14.0" }
solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
solana-vote-signer = { path = "../vote-signer", version = "0.14.0" }
sys-info = "0.5.6"
tokio = "0.1"
@@ -66,8 +66,8 @@ untrusted = "0.6.2"
[dev-dependencies]
hex-literal = "0.1.4"
matches = "0.1.6"
solana-vote-program = { path = "../instruction-processors/vote_program", version = "0.14.0" }
solana-budget-program = { path = "../instruction-processors/budget_program", version = "0.14.0" }
solana-vote-program = { path = "../programs/vote_program", version = "0.14.0" }
solana-budget-program = { path = "../programs/budget_program", version = "0.14.0" }
[[bench]]
name = "banking_stage"

2
fullnode/Cargo.toml
View File

@@ -19,7 +19,7 @@ solana-netutil = { path = "../netutil", version = "0.14.0" }
solana-metrics = { path = "../metrics", version = "0.14.0" }
solana-runtime = { path = "../runtime", version = "0.14.0" }
solana-sdk = { path = "../sdk", version = "0.14.0" }
solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
solana-vote-signer = { path = "../vote-signer", version = "0.14.0" }
[features]

12
genesis/Cargo.toml
View File

@@ -13,16 +13,16 @@ clap = "2.33.0"
serde_json = "1.0.39"
solana = { path = "../core", version = "0.14.0" }
solana-sdk = { path = "../sdk", version = "0.14.0" }
solana-budget-api = { path = "../instruction-processors/budget_api", version = "0.14.0" }
solana-storage-api = { path = "../instruction-processors/storage_api", version = "0.14.0" }
solana-token-api = { path = "../instruction-processors/token_api", version = "0.14.0" }
solana-config-api = { path = "../instruction-processors/config_api", version = "0.14.0" }
solana-exchange-api = { path = "../instruction-processors/exchange_api", version = "0.14.0" }
solana-budget-api = { path = "../programs/budget_api", version = "0.14.0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.14.0" }
solana-token-api = { path = "../programs/token_api", version = "0.14.0" }
solana-config-api = { path = "../programs/config_api", version = "0.14.0" }
solana-exchange-api = { path = "../programs/exchange_api", version = "0.14.0" }
[dev-dependencies]
hashbrown = "0.2.2"
solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
[features]
cuda = ["solana/cuda"]

2
install/Cargo.toml
View File

@@ -29,7 +29,7 @@ serde = "1.0.90"
serde_derive = "1.0.90"
serde_yaml = "0.8.8"
solana-client = { path = "../client", version = "0.14.0" }
solana-config-api = { path = "../instruction-processors/config_api", version = "0.14.0" }
solana-config-api = { path = "../programs/config_api", version = "0.14.0" }
solana-logger = { path = "../logger", version = "0.14.0" }
solana-sdk = { path = "../sdk", version = "0.14.0" }
tar = "0.4.22"

0
instruction-processors/bpf/Cargo.toml → programs/bpf/Cargo.toml
View File

0
instruction-processors/bpf/benches/bpf_loader.rs → programs/bpf/benches/bpf_loader.rs
View File

0
instruction-processors/bpf/build.rs → programs/bpf/build.rs
View File

0
instruction-processors/bpf/c/.gitignore → programs/bpf/c/.gitignore vendored
View File

0
instruction-processors/bpf/c/makefile → programs/bpf/c/makefile
View File

0
instruction-processors/bpf/c/src/bench_alu/bench_alu.c → programs/bpf/c/src/bench_alu/bench_alu.c
View File

0
instruction-processors/bpf/c/src/bench_alu/test_bench_alu.c → programs/bpf/c/src/bench_alu/test_bench_alu.c
View File

0
instruction-processors/bpf/c/src/bpf_to_bpf/entrypoint.c → programs/bpf/c/src/bpf_to_bpf/entrypoint.c
View File

0
instruction-processors/bpf/c/src/bpf_to_bpf/helper.c → programs/bpf/c/src/bpf_to_bpf/helper.c
View File

0
instruction-processors/bpf/c/src/bpf_to_bpf/helper.h → programs/bpf/c/src/bpf_to_bpf/helper.h
View File

0
instruction-processors/bpf/c/src/move_funds/move_funds.c → programs/bpf/c/src/move_funds/move_funds.c
View File

0
instruction-processors/bpf/c/src/multiple_static/multiple_static.c → programs/bpf/c/src/multiple_static/multiple_static.c
View File

0
instruction-processors/bpf/c/src/noop++/noop++.cc → programs/bpf/c/src/noop++/noop++.cc
View File

0
instruction-processors/bpf/c/src/noop/noop.c → programs/bpf/c/src/noop/noop.c
View File

0
instruction-processors/bpf/c/src/relative_call/relative_call.c → programs/bpf/c/src/relative_call/relative_call.c
View File

0
instruction-processors/bpf/c/src/struct_pass/struct_pass.c → programs/bpf/c/src/struct_pass/struct_pass.c
View File

0
instruction-processors/bpf/c/src/struct_ret/struct_ret.c → programs/bpf/c/src/struct_ret/struct_ret.c
View File

0
instruction-processors/bpf/rust/noop/.gitignore → programs/bpf/rust/noop/.gitignore vendored
View File

0
instruction-processors/bpf/rust/noop/Cargo.toml → programs/bpf/rust/noop/Cargo.toml
View File

0
instruction-processors/bpf/rust/noop/Xargo.toml → programs/bpf/rust/noop/Xargo.toml
View File

0
instruction-processors/bpf/rust/noop/bpf.ld → programs/bpf/rust/noop/bpf.ld
View File

0
instruction-processors/bpf/rust/noop/build.sh → programs/bpf/rust/noop/build.sh
View File

0
instruction-processors/bpf/rust/noop/clean.sh → programs/bpf/rust/noop/clean.sh
View File

0
instruction-processors/bpf/rust/noop/dump.sh → programs/bpf/rust/noop/dump.sh
View File

0
instruction-processors/bpf/rust/noop/src/lib.rs → programs/bpf/rust/noop/src/lib.rs
View File

0
instruction-processors/bpf/rust/noop/src/solana_sdk.rs → programs/bpf/rust/noop/src/solana_sdk.rs
View File

0
instruction-processors/bpf/tests/programs.rs → programs/bpf/tests/programs.rs
View File

0
instruction-processors/bpf_loader/Cargo.toml → programs/bpf_loader/Cargo.toml
View File

0
instruction-processors/bpf_loader/src/bpf_verifier.rs → programs/bpf_loader/src/bpf_verifier.rs
View File

0
instruction-processors/bpf_loader/src/lib.rs → programs/bpf_loader/src/lib.rs
View File

0
instruction-processors/budget_api/Cargo.toml → programs/budget_api/Cargo.toml
View File

0
instruction-processors/budget_api/src/budget_expr.rs → programs/budget_api/src/budget_expr.rs
View File

0
instruction-processors/budget_api/src/budget_instruction.rs → programs/budget_api/src/budget_instruction.rs
View File

0
instruction-processors/budget_api/src/budget_processor.rs → programs/budget_api/src/budget_processor.rs
View File

0
instruction-processors/budget_api/src/budget_state.rs → programs/budget_api/src/budget_state.rs
View File

0
instruction-processors/budget_api/src/lib.rs → programs/budget_api/src/lib.rs
View File

0
instruction-processors/budget_program/Cargo.toml → programs/budget_program/Cargo.toml
View File

0
instruction-processors/budget_program/src/lib.rs → programs/budget_program/src/lib.rs
View File

0
instruction-processors/config_api/Cargo.toml → programs/config_api/Cargo.toml
View File

0
instruction-processors/config_api/src/config_instruction.rs → programs/config_api/src/config_instruction.rs
View File

0
instruction-processors/config_api/src/config_processor.rs → programs/config_api/src/config_processor.rs
View File

0
instruction-processors/config_api/src/lib.rs → programs/config_api/src/lib.rs
View File

0
instruction-processors/config_program/Cargo.toml → programs/config_program/Cargo.toml
View File

0
instruction-processors/config_program/src/lib.rs → programs/config_program/src/lib.rs
View File

0
instruction-processors/exchange_api/Cargo.toml → programs/exchange_api/Cargo.toml
View File

0
instruction-processors/exchange_api/src/exchange_instruction.rs → programs/exchange_api/src/exchange_instruction.rs
View File

0
instruction-processors/exchange_api/src/exchange_processor.rs → programs/exchange_api/src/exchange_processor.rs
View File

0
instruction-processors/exchange_api/src/exchange_state.rs → programs/exchange_api/src/exchange_state.rs
View File

0
instruction-processors/exchange_api/src/lib.rs → programs/exchange_api/src/lib.rs
View File

0
instruction-processors/exchange_program/Cargo.toml → programs/exchange_program/Cargo.toml
View File

0
instruction-processors/exchange_program/src/lib.rs → programs/exchange_program/src/lib.rs
View File

0
instruction-processors/failure_program/Cargo.toml → programs/failure_program/Cargo.toml
View File

0
instruction-processors/failure_program/src/lib.rs → programs/failure_program/src/lib.rs
View File

0
instruction-processors/failure_program/tests/failure.rs → programs/failure_program/tests/failure.rs
View File

0
instruction-processors/noop_program/Cargo.toml → programs/noop_program/Cargo.toml
View File

0
instruction-processors/noop_program/src/lib.rs → programs/noop_program/src/lib.rs
View File

0
instruction-processors/noop_program/tests/noop.rs → programs/noop_program/tests/noop.rs
View File

0
instruction-processors/stake_api/Cargo.toml → programs/stake_api/Cargo.toml
View File

0
instruction-processors/stake_api/src/lib.rs → programs/stake_api/src/lib.rs
View File

0
instruction-processors/stake_api/src/stake_instruction.rs → programs/stake_api/src/stake_instruction.rs
View File

0
instruction-processors/stake_api/src/stake_state.rs → programs/stake_api/src/stake_state.rs
View File

0
instruction-processors/stake_program/Cargo.toml → programs/stake_program/Cargo.toml
View File

0
instruction-processors/stake_program/src/lib.rs → programs/stake_program/src/lib.rs
View File

0
instruction-processors/storage_api/Cargo.toml → programs/storage_api/Cargo.toml
View File

0
instruction-processors/storage_api/src/lib.rs → programs/storage_api/src/lib.rs
View File

0
instruction-processors/storage_api/src/storage_contract.rs → programs/storage_api/src/storage_contract.rs
View File

0
instruction-processors/storage_api/src/storage_instruction.rs → programs/storage_api/src/storage_instruction.rs
View File

0
instruction-processors/storage_api/src/storage_processor.rs → programs/storage_api/src/storage_processor.rs
View File

0
instruction-processors/storage_program/Cargo.toml → programs/storage_program/Cargo.toml
View File

0
instruction-processors/storage_program/src/lib.rs → programs/storage_program/src/lib.rs
View File

0
instruction-processors/token_api/Cargo.toml → programs/token_api/Cargo.toml
View File

0
instruction-processors/token_api/src/lib.rs → programs/token_api/src/lib.rs
View File

0
instruction-processors/token_api/src/token_processor.rs → programs/token_api/src/token_processor.rs
View File

0
instruction-processors/token_api/src/token_state.rs → programs/token_api/src/token_state.rs
View File

0
instruction-processors/token_program/Cargo.toml → programs/token_program/Cargo.toml
View File

0
instruction-processors/token_program/src/lib.rs → programs/token_program/src/lib.rs
View File

0
instruction-processors/vote_api/Cargo.toml → programs/vote_api/Cargo.toml
View File

0
instruction-processors/vote_api/src/lib.rs → programs/vote_api/src/lib.rs
View File

0
instruction-processors/vote_api/src/vote_instruction.rs → programs/vote_api/src/vote_instruction.rs
View File

0
instruction-processors/vote_api/src/vote_state.rs → programs/vote_api/src/vote_state.rs
View File

0
instruction-processors/vote_program/Cargo.toml → programs/vote_program/Cargo.toml
View File

0
instruction-processors/vote_program/src/lib.rs → programs/vote_program/src/lib.rs
View File

2
runtime/Cargo.toml
View File

@@ -26,7 +26,7 @@ serde_json = "1.0.38"
solana-logger = { path = "../logger", version = "0.14.0" }
solana-metrics = { path = "../metrics", version = "0.14.0" }
solana-sdk = { path = "../sdk", version = "0.14.0" }
solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
[lib]
name = "solana_runtime"

2
scripts/cargo-install-all.sh
View File

@@ -49,7 +49,7 @@ for crate in "${BIN_CRATES[@]}"; do
)
done
for dir in instruction-processors/*; do
for dir in programs/*; do
for program in echo target/release/deps/libsolana_"$(basename "$dir")".{so,dylib,dll}; do
if [[ -f $program ]]; then
mkdir -p "$installDir/bin/deps"

6
wallet/Cargo.toml
View File

@@ -16,17 +16,17 @@ chrono = { version = "0.4.0", features = ["serde"] }
dirs = "1.0.5"
log = "0.4.2"
serde_json = "1.0.39"
solana-budget-api = { path = "../instruction-processors/budget_api", version = "0.14.0" }
solana-budget-api = { path = "../programs/budget_api", version = "0.14.0" }
solana-client = { path = "../client", version = "0.14.0" }
solana-drone = { path = "../drone", version = "0.14.0" }
solana-logger = { path = "../logger", version = "0.14.0" }
solana-netutil = { path = "../netutil", version = "0.14.0" }
solana-sdk = { path = "../sdk", version = "0.14.0" }
solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
solana-vote-signer = { path = "../vote-signer", version = "0.14.0" }
[dev-dependencies]
solana-budget-program = { path = "../instruction-processors/budget_program", version = "0.14.0" }
solana-budget-program = { path = "../programs/budget_program", version = "0.14.0" }
solana = { path = "../core", version = "0.14.0" }
[features]