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

Integrate Move VM into main build (#5229)

Browse Source 
* Integrate Move VM into top-level build

* Switch to protoc-free libra
This commit is contained in:
Greg Fitzgerald
2019-07-27 06:59:46 -06:00
committed by GitHub
parent 855f7ff352
commit 64c770275b
6 changed files with 1611 additions and 3585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1599
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

@ -30,6 +30,8 @@ members = [
"programs/exchange_api", "programs/exchange_api",
"programs/exchange_program", "programs/exchange_program",
"programs/failure_program", "programs/failure_program",
"programs/move_loader_api",
"programs/move_loader_program",
"programs/noop_program", "programs/noop_program",
"programs/stake_api", "programs/stake_api",
"programs/stake_program", "programs/stake_program",
@ -51,6 +53,4 @@ members = [
exclude = [ exclude = [
"programs/bpf/rust/noop", "programs/bpf/rust/noop",
"programs/move_loader_api",
"programs/move_loader_program",
] ]

3
ci/buildkite.yml
View File

@ -15,9 +15,6 @@ steps:
- command: "ci/test-bench.sh" - command: "ci/test-bench.sh"
name: "bench" name: "bench"
timeout_in_minutes: 60 timeout_in_minutes: 60
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-move-demo.sh"
name: "move-demo"
timeout_in_minutes: 30
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-stable.sh" - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-stable.sh"
name: "stable" name: "stable"
timeout_in_minutes: 40 timeout_in_minutes: 40

34
ci/test-move-demo.sh
View File

@ -1,34 +0,0 @@
#!/usr/bin/env bash
set -e
cd "$(dirname "$0")/.."
annotate() {
${BUILDKITE:-false} && {
buildkite-agent annotate "$@"
}
}
ci/affects-files.sh \
.rs$ \
Cargo.lock$ \
Cargo.toml$ \
ci/test-move-demo.sh \
|| {
annotate --style info --context test-bench \
"Bench skipped as no .rs files were modified"
exit 0
}
source ci/_
source ci/upload-ci-artifact.sh
eval "$(ci/channel-info.sh)"
source ci/rust-version.sh stable
set -o pipefail
export RUST_BACKTRACE=1
# Run Move tests
_ cargo +"$rust_stable" test --manifest-path=programs/move_loader_program/Cargo.toml ${V:+--verbose}
_ cargo +"$rust_stable" test --manifest-path=programs/move_loader_api/Cargo.toml ${V:+--verbose}

20
programs/move_loader_api/Cargo.toml
View File

@ -20,16 +20,16 @@ serde_json = "1.0.40"
solana-logger = { path = "../../logger", version = "0.17.0" } solana-logger = { path = "../../logger", version = "0.17.0" }
solana-sdk = { path = "../../sdk", version = "0.17.0" } solana-sdk = { path = "../../sdk", version = "0.17.0" }
bytecode_verifier = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_bytecode_verifier" } bytecode_verifier = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_bytecode_verifier" }
compiler = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_compiler" } compiler = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_compiler" }
failure = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_failure_ext" } failure = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_failure_ext" }
language_e2e_tests = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_language_e2e_tests" } language_e2e_tests = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_language_e2e_tests" }
state_view = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_state_view" } state_view = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_state_view" }
stdlib = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_stdlib" } stdlib = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_stdlib" }
types = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_types" } types = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_types" }
vm = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_vm" } vm = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_vm" }
vm_cache_map = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_vm_cache_map" } vm_cache_map = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_vm_cache_map" }
vm_runtime = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_vm_runtime" } vm_runtime = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_vm_runtime" }
[lib] [lib]
crate-type = ["lib"] crate-type = ["lib"]

3536
programs/move_loader_program/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff