Rename programs to instruction_processors (#3789)
* Rename programs to instruction_processors * Updates around the code base to support instruction_processors rename * Kabab instruction_processors * Update Cargo.toml files and scripts to use instruction-processors * Update Cargo.toml to use instruction-processors * Update CI scripts to use instruction-processors
This commit is contained in:
Amr Ali
GitHub
parent
f73d38739a
commit
34344982a9
38
Cargo.toml
38
Cargo.toml
|
|
@ -13,28 +13,28 @@ members = [
|
|||
"ledger-tool",
|
||||
"logger",
|
||||
"metrics",
|
||||
"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",
|
||||
"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",
|
||||
"replicator",
|
||||
"sdk",
|
||||
"upload-perf",
|
||||
"vote-signer",
|
||||
"wallet",
|
||||
]
|
||||
exclude = ["programs/bpf/rust/noop"]
|
||||
exclude = ["instruction-processors/bpf/rust/noop"]
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ CRATES=(
|
|||
metrics
|
||||
client
|
||||
drone
|
||||
programs/{budget_api,config_api,storage_api,token_api,vote_api}
|
||||
instruction-processors/{budget_api,config_api,storage_api,token_api,vote_api}
|
||||
runtime
|
||||
programs/{budget,bpf_loader,config,vote,storage,token,vote}
|
||||
instruction-processors/{budget,bpf_loader,config,vote,storage,token,vote}
|
||||
vote-signer
|
||||
core
|
||||
fullnode
|
||||
|
|
|
|||
|
|
@ -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 programs/bpf/Cargo.toml ${V:+--verbose} --features=bpf_c \
|
||||
_ cargo +$rust_nightly bench --manifest-path instruction-processors/bpf/Cargo.toml ${V:+--verbose} --features=bpf_c \
|
||||
-- -Z unstable-options --format=json --nocapture | tee -a "$BENCH_FILE"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ test-stable-perf)
|
|||
Cargo.toml$ \
|
||||
ci/test-stable-perf.sh \
|
||||
ci/test-stable.sh \
|
||||
^programs/ \
|
||||
^instruction-processors/ \
|
||||
^sdk/ \
|
||||
|| {
|
||||
annotate --style info \
|
||||
|
|
@ -46,10 +46,10 @@ test-stable-perf)
|
|||
}
|
||||
|
||||
# BPF program tests
|
||||
_ make -C programs/bpf/c tests
|
||||
_ programs/bpf/rust/noop/build.sh # Must be built out of band
|
||||
_ make -C instruction-processors/bpf/c tests
|
||||
_ instruction-processors/bpf/rust/noop/build.sh # Must be built out of band
|
||||
_ cargo +"$rust_stable" test \
|
||||
--manifest-path programs/bpf/Cargo.toml \
|
||||
--manifest-path instruction-processors/bpf/Cargo.toml \
|
||||
--no-default-features --features=bpf_c,bpf_rust
|
||||
|
||||
# Run root package tests with these features
|
||||
|
|
|
|||
|
|
@ -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 = "../programs/budget_api", version = "0.14.0" }
|
||||
solana-budget-api = { path = "../instruction-processors/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 = "../programs/storage_api", version = "0.14.0" }
|
||||
solana-vote-api = { path = "../programs/vote_api", 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-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 = "../programs/vote_program", version = "0.14.0" }
|
||||
solana-budget-program = { path = "../programs/budget_program", version = "0.14.0" }
|
||||
solana-vote-program = { path = "../instruction-processors/vote_program", version = "0.14.0" }
|
||||
solana-budget-program = { path = "../instruction-processors/budget_program", version = "0.14.0" }
|
||||
|
||||
[[bench]]
|
||||
name = "banking_stage"
|
||||
|
|
|
|||
|
|
@ -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 = "../programs/vote_api", version = "0.14.0" }
|
||||
solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
|
||||
solana-vote-signer = { path = "../vote-signer", version = "0.14.0" }
|
||||
|
||||
[features]
|
||||
|
|
|
|||
|
|
@ -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 = "../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" }
|
||||
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" }
|
||||
|
||||
|
||||
[dev-dependencies]
|
||||
hashbrown = "0.2.2"
|
||||
solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
|
||||
solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
|
||||
|
||||
[features]
|
||||
cuda = ["solana/cuda"]
|
||||
|
|
|
|||
|
|
@ -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 = "../programs/config_api", version = "0.14.0" }
|
||||
solana-config-api = { path = "../instruction-processors/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"
|
||||
|
|
|
|||
|
|
@ -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 = "../programs/vote_api", version = "0.14.0" }
|
||||
solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
|
||||
|
||||
[lib]
|
||||
name = "solana_runtime"
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ for crate in "${BIN_CRATES[@]}"; do
|
|||
)
|
||||
done
|
||||
|
||||
for dir in programs/*; do
|
||||
for dir in instruction-processors/*; do
|
||||
for program in echo target/release/deps/libsolana_"$(basename "$dir")".{so,dylib,dll}; do
|
||||
if [[ -f $program ]]; then
|
||||
mkdir -p "$installDir/bin/deps"
|
||||
|
|
|
|||
|
|
@ -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 = "../programs/budget_api", version = "0.14.0" }
|
||||
solana-budget-api = { path = "../instruction-processors/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 = "../programs/vote_api", version = "0.14.0" }
|
||||
solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
|
||||
solana-vote-signer = { path = "../vote-signer", version = "0.14.0" }
|
||||
|
||||
[dev-dependencies]
|
||||
solana-budget-program = { path = "../programs/budget_program", version = "0.14.0" }
|
||||
solana-budget-program = { path = "../instruction-processors/budget_program", version = "0.14.0" }
|
||||
solana = { path = "../core", version = "0.14.0" }
|
||||
|
||||
[features]
|
||||
|
|
|
|||
Loading…
Reference in New Issue