Skip to content

Commit

Permalink
[language] move diem-transactional-test-harness, e2e-tests, `e2e-…
Browse files Browse the repository at this point in the history
…testsuite` into `diem-move`

Closes: aptos-labs#9998
  • Loading branch information
vgao1996 authored and bors-libra committed Dec 14, 2021
1 parent 92e782d commit ef551d1
Show file tree
Hide file tree
Showing 318 changed files with 145 additions and 131 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,12 @@ members = [
"diem-move/diem-keygen",
"diem-move/diem-resource-viewer",
"diem-move/diem-transaction-benchmarks",
"diem-move/diem-transactional-test-harness",
"diem-move/diem-validator-interface",
"diem-move/diem-vm",
"diem-move/e2e-tests",
"diem-move/e2e-tests-replay",
"diem-move/e2e-testsuite",
"diem-move/genesis-viewer",
"diem-move/mvhashmap",
"diem-move/oncall-trainer",
Expand All @@ -82,7 +85,6 @@ members = [
"json-rpc/types",
"json-rpc/types/proto",
"language/benchmarks",
"language/e2e-testsuite",
"language/move-analyzer",
"language/move-binary-format",
"language/move-binary-format/serializer-tests",
Expand Down Expand Up @@ -123,8 +125,6 @@ members = [
"language/move-vm/test-utils",
"language/move-vm/transactional-tests",
"language/move-vm/types",
"language/testing-infra/diem-transactional-test-harness",
"language/testing-infra/e2e-tests",
"language/testing-infra/functional-tests",
"language/testing-infra/module-generation",
"language/testing-infra/test-generation",
Expand Down
2 changes: 1 addition & 1 deletion diem-move/diem-transaction-benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ proptest = "1.0.0"
criterion-cpu-time = "0.1.0"

diem-types = { path = "../../types", features = ["fuzzing"] }
language-e2e-tests = { path = "../../language/testing-infra/e2e-tests" }
language-e2e-tests = { path = "../e2e-tests" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
diem-crypto = { path = "../../crates/diem-crypto" }

Expand Down
47 changes: 47 additions & 0 deletions diem-move/diem-transactional-test-harness/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
[package]
name = "diem-transactional-test-harness"
version = "0.1.0"
authors = ["Diem Association <[email protected]>"]
description = "Transactional testing framework for Move"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
license = "Apache-2.0"
publish = false
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
either = "1.6.1"
once_cell = "1.7.2"
anyhow = "1.0.38"
structopt = "0.3.21"
bcs = "0.1.2"

# Move dependencies
move-transactional-test-runner = { path = "../../language/testing-infra/transactional-test-runner" }
move-compiler = { path = "../../language/move-compiler" }
move-binary-format = { path = "../../language/move-binary-format" }
move-core-types = { path = "../../language/move-core/types" }
move-command-line-common = { path = "../../language/move-command-line-common" }

# Diem-Move dependencies
language-e2e-tests = { path = "../e2e-tests" }
diem-vm = { path = "../diem-vm" }
vm-genesis= { path = "../vm-genesis" }
diem-framework = { path = "../diem-framework" }
diem-keygen = { path = "../diem-keygen" }

# Other Diem dependencies
diem-types = { path = "../../types", features = ["fuzzing"] }
diem-transaction-builder = { path = "../../sdk/transaction-builder" }
diem-crypto = { path = "../../crates/diem-crypto" }
diem-state-view = { path = "../../storage/state-view" }
diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" }

[dev-dependencies]
datatest-stable = "0.1.1"

[[test]]
name = "tests"
harness = false
2 changes: 1 addition & 1 deletion diem-move/e2e-tests-replay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ move-stackless-bytecode-interpreter = { path = "../../language/move-prover/inter
diem-types = { path = "../../types", features = ["fuzzing"] }
diem-framework = { path = "../../diem-move/diem-framework" }
diem-vm = { path = "../../diem-move/diem-vm" }
language-e2e-tests = { path = "../../language/testing-infra/e2e-tests" }
language-e2e-tests = { path = "../e2e-tests" }
move-binary-format = { path = "../../language/move-binary-format" }
move-core-types = { path = "../../language/move-core/types" }
move-model = { path = "../../language/move-model" }
Expand Down
46 changes: 46 additions & 0 deletions diem-move/e2e-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
[package]
name = "language-e2e-tests"
version = "0.1.0"
edition = "2018"
authors = ["Diem Association <[email protected]>"]
description = "Diem language e2e testing framework"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
license = "Apache-2.0"
publish = false

[dependencies]
anyhow = "1.0.38"
goldenfile = "1.1.0"
bcs = "0.1.2"
once_cell = "1.7.2"
rand = "0.8.3"
proptest = "1.0.0"
proptest-derive = "0.3.0"
hex = "0.4.3"
serde = { version = "1.0.124", default-features = false }

## Move dependencies
move-core-types = { path = "../../language/move-core/types" }
move-ir-compiler = { path = "../../language/move-ir-compiler" }
move-vm-runtime = { path = "../../language/move-vm/runtime" }
move-vm-types = { path = "../../language/move-vm/types" }
move-binary-format = { path = "../../language/move-binary-format" }
read-write-set = { path = "../../language/tools/read-write-set" }
move-command-line-common = { path = "../../language/move-command-line-common" }

## Diem-Move dependencies
diem-writeset-generator = { path = "../writeset-transaction-generator" }
vm-genesis = { path = "../vm-genesis" }
diem-vm = { path = "../diem-vm" }
diem-keygen = { path = "../diem-keygen" }
diem-framework-releases = { path = "../diem-framework/DPN/releases" }

## Other Diem Dependencies
diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] }
diem-state-view = { path = "../../storage/state-view" }
diem-types = { path = "../../types", features = ["fuzzing"] }
diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers" }
diem-config = { path = "../../config" }
diem-transaction-builder = { path = "../../sdk/transaction-builder" }
diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
44 changes: 44 additions & 0 deletions diem-move/e2e-testsuite/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[package]
name = "language-e2e-testsuite"
version = "0.1.0"
edition = "2018"
authors = ["Diem Association <[email protected]>"]
description = "Diem language e2e tests"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
license = "Apache-2.0"
publish = false

[dependencies]
serde_json = "1.0.64"
hex = "0.4.3"
bcs = "0.1.2"
proptest = "1.0.0"

## Move dependencies
move-core-types = { path = "../../language/move-core/types" }
move-ir-compiler = { path = "../../language/move-ir-compiler" }
move-vm-runtime = { path = "../../language/move-vm/runtime" }
move-vm-types = { path = "../../language/move-vm/types" }
move-binary-format = { path = "../../language/move-binary-format" }
move-bytecode-verifier = { path = "../../language/move-bytecode-verifier" }
read-write-set = { path = "../../language/tools/read-write-set" }

## Diem-Move dependencies
language-e2e-tests = { path = "../e2e-tests" }
diem-keygen = { path = "../diem-keygen" }
diem-vm = { path = "../diem-vm" }
diem-framework-releases = { path = "../diem-framework/DPN/releases" }
diem-parallel-executor = { path = "../parallel-executor" }
diem-writeset-generator = { path = "../writeset-transaction-generator"}

## Other Diem dependencies
diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] }
diem-types = { path = "../../types", features = ["fuzzing"] }
diem-transaction-builder = { path = "../../sdk/transaction-builder"}
diem-logger = { path = "../../crates/diem-logger" }
diem-state-view = { path = "../../storage/state-view" }
diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" }

[features]
default = ["diem-transaction-builder/fuzzing"]
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit ef551d1

Please sign in to comment.