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

Disable Move/Libra components

Browse Source
This commit is contained in:
Trent Nelson
2020-04-27 17:09:07 -06:00
committed by Trent Nelson
parent d836dfff14
commit 3d40ca86b0
6 changed files with 2937 additions and 4652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6373
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

8
bench-tps/Cargo.toml
View File

@ -19,22 +19,22 @@ solana-core = { path = "../core", version = "1.2.0" }
solana-genesis = { path = "../genesis", version = "1.2.0" } solana-genesis = { path = "../genesis", version = "1.2.0" }
solana-client = { path = "../client", version = "1.2.0" } solana-client = { path = "../client", version = "1.2.0" }
solana-faucet = { path = "../faucet", version = "1.2.0" } solana-faucet = { path = "../faucet", version = "1.2.0" }
solana-librapay = { path = "../programs/librapay", version = "1.2.0", optional = true } #solana-librapay = { path = "../programs/librapay", version = "1.2.0", optional = true }
solana-logger = { path = "../logger", version = "1.2.0" } solana-logger = { path = "../logger", version = "1.2.0" }
solana-metrics = { path = "../metrics", version = "1.2.0" } solana-metrics = { path = "../metrics", version = "1.2.0" }
solana-measure = { path = "../measure", version = "1.2.0" } solana-measure = { path = "../measure", version = "1.2.0" }
solana-net-utils = { path = "../net-utils", version = "1.2.0" } solana-net-utils = { path = "../net-utils", version = "1.2.0" }
solana-runtime = { path = "../runtime", version = "1.2.0" } solana-runtime = { path = "../runtime", version = "1.2.0" }
solana-sdk = { path = "../sdk", version = "1.2.0" } solana-sdk = { path = "../sdk", version = "1.2.0" }
solana-move-loader-program = { path = "../programs/move_loader", version = "1.2.0", optional = true } #solana-move-loader-program = { path = "../programs/move_loader", version = "1.2.0", optional = true }
[dev-dependencies] [dev-dependencies]
serial_test = "0.4.0" serial_test = "0.4.0"
serial_test_derive = "0.4.0" serial_test_derive = "0.4.0"
solana-local-cluster = { path = "../local-cluster", version = "1.2.0" } solana-local-cluster = { path = "../local-cluster", version = "1.2.0" }
[features] #[features]
move = ["solana-librapay", "solana-move-loader-program"] #move = ["solana-librapay", "solana-move-loader-program"]
[package.metadata.docs.rs] [package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"] targets = ["x86_64-unknown-linux-gnu"]

2
ci/test-stable.sh
View File

@ -47,7 +47,7 @@ echo "Executing $testName"
case $testName in case $testName in
test-stable) test-stable)
_ cargo +"$rust_stable" test --jobs "$NPROC" --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture _ cargo +"$rust_stable" test --jobs "$NPROC" --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
_ cargo +"$rust_stable" test --manifest-path bench-tps/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture #_ cargo +"$rust_stable" test --manifest-path bench-tps/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture
;; ;;
test-stable-perf) test-stable-perf)
ci/affects-files.sh \ ci/affects-files.sh \

1
client/src/client_error.rs
View File

@ -52,7 +52,6 @@ impl Into<TransportError> for ClientErrorKind {
pub struct ClientError { pub struct ClientError {
command: Option<&'static str>, command: Option<&'static str>,
#[source] #[source]
#[error(transparent)]
kind: ClientErrorKind, kind: ClientErrorKind,
} }

1203
programs/bpf/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
scripts/cargo-for-all-lock-files.sh
View File

@ -26,7 +26,7 @@ if [[ -n $escape_marker && ${#shifted_args[@]} -gt 0 ]]; then
done done
shifted_args=() shifted_args=()
else else
files="$(git ls-files :**Cargo.lock)" files="$(git ls-files :**Cargo.lock | grep -vE 'programs/(librapay|move_loader)')"
fi fi
for lock_file in $files; do for lock_file in $files; do