trivial: reorder dependencies of aptos-vm

sun-shine-chain · Apr 7, 2022 · 38d0f86 · 38d0f86
1 parent e494927
commit 38d0f86
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/types/Cargo.toml b/api/types/Cargo.toml
@@ -17,11 +17,11 @@ serde = { version = "1.0.124", default-features = false }
 serde_json = "1.0.64"
 warp = { version = "0.3.2", features = ["default"] }
 
-aptos-vm = { path = "../../aptos-move/aptos-vm" }
 aptos-crypto = { path = "../../crates/aptos-crypto" }
 aptos-state-view = { path = "../../storage/state-view" }
 aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
 aptos-types = { path = "../../types" }
+aptos-vm = { path = "../../aptos-move/aptos-vm" }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
 move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
 move-core-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"] }

diff --git a/aptos-move/aptos-vm/Cargo.toml b/aptos-move/aptos-vm/Cargo.toml
@@ -11,32 +11,34 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.52"
+bcs = "0.1.2"
 fail = "0.4.0"
+mirai-annotations = "1.10.1"
 once_cell = "1.7.2"
 rayon = "1.5.0"
-mirai-annotations = "1.10.1"
+tracing = "0.1.16"
+
+move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-bytecode-utils = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-core-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"] }
+move-stdlib = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-vm-runtime = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-vm-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa"}
 
-bcs = "0.1.2"
 aptos-crypto = { path = "../../crates/aptos-crypto" }
 aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" }
 aptos-logger = { path = "../../crates/aptos-logger" }
 aptos-metrics = { path = "../../crates/aptos-metrics" }
+aptos-parallel-executor = {path = "../parallel-executor" }
 aptos-state-view = { path = "../../storage/state-view" }
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 framework =  { path = "../framework" }
-move-core-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"] }
-move-vm-runtime = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-vm-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-bytecode-utils = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-stdlib = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+mvhashmap = { path = "../mvhashmap" }
 serde_json = "1.0.64"
 serde = { version = "1.0.124", default-features = false }
-read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa"}
 
-mvhashmap = { path = "../mvhashmap" }
-aptos-parallel-executor = {path = "../parallel-executor" }
 
 [dev-dependencies]
 proptest = "1.0.0"

diff --git a/aptos-move/e2e-tests/Cargo.toml b/aptos-move/e2e-tests/Cargo.toml
@@ -11,35 +11,36 @@ publish = false
 
 [dependencies]
 anyhow = "1.0.52"
-goldenfile = "1.1.0"
 bcs = "0.1.2"
+goldenfile = "1.1.0"
+hex = "0.4.3"
 once_cell = "1.7.2"
-rand = "0.8.3"
 proptest = "1.0.0"
 proptest-derive = "0.3.0"
+rand = "0.8.3"
 serde = { version = "1.0.124", default-features = false }
 
 ## Move dependencies
+move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-command-line-common = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
 move-core-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"] }
 move-ir-compiler = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
 move-vm-runtime = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
 move-vm-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
 read-write-set = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-command-line-common = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
 
 ## Diem-Move dependencies
-aptos-writeset-generator = { path = "../writeset-transaction-generator" }
-aptos-vm = { path = "../aptos-vm" }
 aptos-keygen = { path = "../aptos-keygen" }
+aptos-vm = { path = "../aptos-vm" }
+aptos-writeset-generator = { path = "../writeset-transaction-generator" }
 cached-framework-packages = { path = "../framework/cached-packages" }
 vm-genesis = { path = "../vm-genesis" }
 
 ## Other Diem Dependencies
+aptos-config = { path = "../../config" }
 aptos-crypto = { path = "../../crates/aptos-crypto", features = ["fuzzing"] }
-aptos-state-view = { path = "../../storage/state-view" }
-aptos-types = { path = "../../types", features = ["fuzzing"] }
 aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers" }
-aptos-config = { path = "../../config" }
+aptos-state-view = { path = "../../storage/state-view" }
 aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
+aptos-types = { path = "../../types", features = ["fuzzing"] }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
diff --git a/storage/aptosdb/Cargo.toml b/storage/aptosdb/Cargo.toml
@@ -12,31 +12,30 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.52"
 arc-swap = "1.2.0"
+bcs = "0.1.2"
 byteorder = "1.4.3"
 itertools = "0.10.0"
-once_cell = "1.7.2"
 num-derive = "0.3.3"
 num-traits = "0.2.14"
+once_cell = "1.7.2"
 proptest = { version = "1.0.0", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 serde = "1.0.124"
 thiserror = "1.0.24"
 
 accumulator = { path = "../accumulator" }
-bcs = "0.1.2"
 aptos-config = { path = "../../config" }
 aptos-crypto = { path = "../../crates/aptos-crypto" }
+aptos-infallible = { path = "../../crates/aptos-infallible" }
 aptos-jellyfish-merkle = { path = "../jellyfish-merkle" }
 aptos-logger = { path = "../../crates/aptos-logger" }
 aptos-metrics = { path = "../../crates/aptos-metrics" }
-aptos-infallible = { path = "../../crates/aptos-infallible" }
 aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers", optional = true }
 aptos-temppath = { path = "../../crates/aptos-temppath", optional = true }
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
 executor-types = { path = "../../execution/executor-types", optional = true }
 move-core-types = {git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"]}
-
 num-variants = { path = "../../crates/num-variants" }
 schemadb = { path = "../schemadb" }
 scratchpad = { path = "../scratchpad", optional = true }