[move] Use workspace dependencies for third-party/move

aptos-labs · Dec 3, 2024 · c684964 · c684964
1 parent 522ebdb
commit c684964
Show file tree

Hide file tree

Showing 60 changed files with 326 additions and 450 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -623,6 +623,7 @@ http = "0.2.9"
 httpmock = "0.6.8"
 hyper = { version = "0.14.18", features = ["full"] }
 hyper-tls = "0.5.0"
+im = "15.0.0"
 image = "0.24.5"
 indexmap = "1.9.3"
 include_dir = { version = "0.7.2", features = ["glob"] }
@@ -854,8 +855,12 @@ move-docgen = { path = "third_party/move/move-prover/move-docgen" }
 move-disassembler = { path = "third_party/move/tools/move-disassembler" }
 move-ir-types = { path = "third_party/move/move-ir/types" }
 move-ir-compiler = { path = "third_party/move/move-ir-compiler" }
+move-ir-to-bytecode = { path = "third_party/move/move-ir-compiler/move-ir-to-bytecode" }
 move-linter = { path = "third_party/move/tools/move-linter" }
+move-borrow-graph = { path = "third_party/move/move-borrow-graph" }
 move-bytecode-source-map = { path = "third_party/move/move-ir-compiler/move-bytecode-source-map" }
+move-bytecode-viewer = { path = "third_party/move/tools/move-bytecode-viewer" }
+move-errmapgen = { path = "third_party/move/move-prover/move-errmapgen" }
 move-model = { path = "third_party/move/move-model" }
 move-package = { path = "third_party/move/tools/move-package" }
 move-prover = { path = "third_party/move/move-prover" }
@@ -870,14 +875,10 @@ move-resource-viewer = { path = "third_party/move/tools/move-resource-viewer" }
 move-symbol-pool = { path = "third_party/move/move-symbol-pool" }
 move-table-extension = { path = "third_party/move/extensions/move-table-extension" }
 move-transactional-test-runner = { path = "third_party/move/testing-infra/transactional-test-runner" }
-move-unit-test = { path = "third_party/move/tools/move-unit-test", features = [
-    "table-extension",
-] }
+move-unit-test = { path = "third_party/move/tools/move-unit-test", features = ["table-extension"] }
 move-vm-metrics = { path = "third_party/move/move-vm/metrics" }
 move-vm-runtime = { path = "third_party/move/move-vm/runtime" }
-move-vm-test-utils = { path = "third_party/move/move-vm/test-utils", features = [
-    "table-extension",
-] }
+move-vm-test-utils = { path = "third_party/move/move-vm/test-utils", features = ["table-extension"] }
 move-vm-types = { path = "third_party/move/move-vm/types" }
 
 [profile.release]

diff --git a/aptos-move/framework/move-stdlib/Cargo.toml b/aptos-move/framework/move-stdlib/Cargo.toml
@@ -15,20 +15,20 @@ aptos-gas-schedule = { workspace = true }
 aptos-native-interface = { workspace = true }
 aptos-types = { workspace = true }
 bcs = { workspace = true }
-move-core-types = { path = "../../../third_party/move/move-core/types" }
-move-vm-runtime = { path = "../../../third_party/move/move-vm/runtime" }
-move-vm-types = { path = "../../../third_party/move/move-vm/types" }
-sha2 = "0.9.3"
-sha3 = "0.9.1"
-smallvec = "1.6.1"
+move-core-types = { workspace = true }
+move-vm-runtime = { workspace = true }
+move-vm-types = { workspace = true }
+sha2 = { workspace = true }
+sha3 = { workspace = true }
+smallvec = { workspace = true }
 
 [dev-dependencies]
 dir-diff = "0.3.2"
 file_diff = "1.0.0"
-move-cli = { path = "../../../third_party/move/tools/move-cli" }
-move-package = { path = "../../../third_party/move/tools/move-package" }
-move-unit-test = { path = "../../../third_party/move/tools/move-unit-test" }
-tempfile = "3.2.0"
+move-cli = { workspace = true }
+move-package = { workspace = true }
+move-unit-test = { workspace = true }
+tempfile = { workspace = true }
 
 [features]
 testing = []
diff --git a/testsuite/fuzzer/Cargo.toml b/testsuite/fuzzer/Cargo.toml
@@ -13,7 +13,7 @@ bcs = { workspace = true }
 clap = "4.5.20"
 csv = "1.3.0"
 dearbitrary = { workspace = true }
-hex = "0.4.3"
+hex = { workspace = true }
 move-binary-format = { workspace = true, features = ["fuzzing"] }
 move-core-types = { workspace = true, features = ["fuzzing"] }
 sha2 = { workspace = true }
diff --git a/third_party/move/evm/exec-utils/Cargo.toml b/third_party/move/evm/exec-utils/Cargo.toml
@@ -12,10 +12,9 @@ anyhow = { workspace = true }
 evm = { workspace = true }
 evm-runtime = { workspace = true }
 hex = { workspace = true }
+move-command-line-common = { workspace = true }
 primitive-types = { workspace = true }
-# external dependencies
 sha3 = { workspace = true }
 tempfile = { workspace = true }
 
 # move dependencies
-move-command-line-common = { path = "../../move-command-line-common" }
diff --git a/third_party/move/evm/move-to-yul/Cargo.toml b/third_party/move/evm/move-to-yul/Cargo.toml
@@ -8,15 +8,6 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-move-command-line-common = { path = "../../move-command-line-common" }
-move-compiler = { path = "../../move-compiler" }
-move-core-types = { path = "../../move-core/types" }
-move-ethereum-abi = { path = "../move-ethereum-abi" }
-move-model = { path = "../../move-model" }
-# move dependencies
-move-stackless-bytecode = { path = "../../move-model/bytecode" }
-
-# external dependencies
 anyhow = { workspace = true }
 atty = { workspace = true }
 clap = { workspace = true }
@@ -26,6 +17,12 @@ ethnum = { workspace = true }
 evm = { workspace = true }
 itertools = { workspace = true }
 maplit = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-core-types = { workspace = true }
+move-ethereum-abi = { path = "../move-ethereum-abi" }
+move-model = { workspace = true }
+move-stackless-bytecode = { workspace = true }
 once_cell = { workspace = true }
 primitive-types = { workspace = true }
 regex = { workspace = true }

diff --git a/third_party/move/extensions/move-table-extension/Cargo.toml b/third_party/move/extensions/move-table-extension/Cargo.toml
@@ -11,16 +11,16 @@ publish = false
 [dependencies]
 better_any = { workspace = true }
 bytes = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-core-types = { path = "../../move-core/types" }
-move-vm-runtime = { path = "../../move-vm/runtime" }
-move-vm-types = { path = "../../move-vm/types" }
+move-binary-format = { workspace = true }
+move-core-types = { workspace = true }
+move-vm-runtime = { workspace = true }
+move-vm-types = { workspace = true }
 sha3 = { workspace = true }
 smallvec = { workspace = true }
 
 [dev-dependencies]
-move-cli = { path = "../../tools/move-cli" }
-move-package = { path = "../../tools/move-package" }
+move-cli = { workspace = true }
+move-package = { workspace = true }
 move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
-move-unit-test = { path = "../../tools/move-unit-test", features = ["table-extension"] }
+move-unit-test = { workspace = true, features = ["table-extension"] }
 tempfile = { workspace = true }
diff --git a/third_party/move/move-binary-format/Cargo.toml b/third_party/move/move-binary-format/Cargo.toml
@@ -16,15 +16,15 @@ backtrace = { workspace = true }
 dearbitrary = { workspace = true, optional = true, features = ["derive"] }
 indexmap = { workspace = true }
 move-bytecode-spec = { workspace = true }
-move-core-types = { path = "../move-core/types" }
+move-core-types = { workspace = true }
 proptest = { workspace = true, optional = true }
 proptest-derive = { workspace = true, optional = true }
 ref-cast = { workspace = true }
 serde = { workspace = true }
 variant_count = { workspace = true }
 
 [dev-dependencies]
-move-core-types = { path = "../move-core/types", features = ["fuzzing"] }
+move-core-types = { workspace = true, features = ["fuzzing"] }
 proptest = { workspace = true }
 proptest-derive = { workspace = true }
 serde_json = { workspace = true }

diff --git a/third_party/move/move-binary-format/serializer-tests/Cargo.toml b/third_party/move/move-binary-format/serializer-tests/Cargo.toml
@@ -10,8 +10,8 @@ publish = false
 edition = "2021"
 
 [dev-dependencies]
-move-binary-format = { path = "../", features = ["fuzzing"] }
-move-core-types = { path = "../../move-core/types" }
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+move-core-types = { workspace = true }
 proptest = { workspace = true }
 proptest-derive = { workspace = true }
 

diff --git a/third_party/move/move-bytecode-verifier/Cargo.toml b/third_party/move/move-bytecode-verifier/Cargo.toml
@@ -11,17 +11,13 @@ edition = "2021"
 
 [dependencies]
 fail = { workspace = true }
-move-binary-format = { path = "../move-binary-format" }
+move-binary-format = { workspace = true }
+move-borrow-graph = { workspace = true }
+move-core-types = { workspace = true }
 petgraph = { workspace = true }
 serde = { workspace = true }
 typed-arena = { workspace = true }
 
-move-borrow-graph = { path = "../move-borrow-graph" }
-move-core-types = { path = "../move-core/types" }
-
 [dev-dependencies]
 hex-literal = { workspace = true }
 invalid-mutations = { path = "invalid-mutations" }
-
-[features]
-default = []
diff --git a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
@@ -13,9 +13,9 @@ edition = "2021"
 fail = { workspace = true, features = ['failpoints'] }
 hex = { workspace = true }
 invalid-mutations = { path = "../invalid-mutations" }
-move-binary-format = { path = "../../move-binary-format", features = ["fuzzing"] }
-move-bytecode-verifier = { path = "../" }
-move-core-types = { path = "../../move-core/types" }
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+move-bytecode-verifier = { workspace = true }
+move-core-types = { workspace = true }
 petgraph = { workspace = true }
 proptest = { workspace = true }
 

diff --git a/third_party/move/move-bytecode-verifier/fuzz/Cargo.toml b/third_party/move/move-bytecode-verifier/fuzz/Cargo.toml
@@ -12,12 +12,9 @@ cargo-fuzz = true
 [dependencies]
 arbitrary = { workspace = true }
 libfuzzer-sys = { workspace = true }
-move-binary-format = { path = "../../move-binary-format", features = ["fuzzing"] }
-move-bytecode-verifier = { path = "../" }
-move-core-types = { path = "../../move-core/types", features = ["fuzzing"] }
-# Prevent this from interfering with workspaces
-#[workspace]
-#members = ["."]
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+move-bytecode-verifier = { workspace = true }
+move-core-types = { workspace = true, features = ["fuzzing"] }
 
 [[bin]]
 name = "code_unit"

diff --git a/third_party/move/move-bytecode-verifier/invalid-mutations/Cargo.toml b/third_party/move/move-bytecode-verifier/invalid-mutations/Cargo.toml
@@ -10,9 +10,6 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-move-binary-format = { path = "../../move-binary-format" }
-move-core-types = { path = "../../move-core/types" }
+move-binary-format = { workspace = true }
+move-core-types = { workspace = true }
 proptest = { workspace = true }
-
-[features]
-default = []
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/Cargo.toml b/third_party/move/move-bytecode-verifier/transactional-tests/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
-move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner" }
+move-transactional-test-runner = { workspace = true }
 
 [[test]]
 name = "tests"

diff --git a/third_party/move/move-command-line-common/Cargo.toml b/third_party/move/move-command-line-common/Cargo.toml
@@ -14,10 +14,9 @@ anyhow = { workspace = true }
 difference = { workspace = true }
 dirs-next = { workspace = true }
 hex = { workspace = true }
+move-core-types = { workspace = true }
 num-bigint = { workspace = true }
 once_cell = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 sha2 = { workspace = true }
 walkdir = { workspace = true }
-
-move-core-types = { path = "../move-core/types" }
diff --git a/third_party/move/move-compiler-v2/Cargo.toml b/third_party/move/move-compiler-v2/Cargo.toml
@@ -13,36 +13,34 @@ edition = "2021"
 abstract-domain-derive = { path = "../move-model/bytecode/abstract_domain_derive" }
 anyhow = { workspace = true }
 bcs = { workspace = true }
-move-binary-format = { path = "../move-binary-format" }
-move-borrow-graph = { path = "../move-borrow-graph" }
-move-bytecode-source-map = { path = "../move-ir-compiler/move-bytecode-source-map" }
-move-bytecode-verifier = { path = "../move-bytecode-verifier" }
-move-command-line-common = { path = "../move-command-line-common" }
-move-compiler = { path = "../move-compiler" }
-move-core-types = { path = "../move-core/types" }
-move-disassembler = { path = "../tools/move-disassembler" }
-move-ir-types = { path = "../move-ir/types" }
-move-model = { path = "../move-model" }
-move-stackless-bytecode = { path = "../move-model/bytecode" }
-move-symbol-pool = { path = "../move-symbol-pool" }
-
 clap = { workspace = true, features = ["derive", "env"] }
 codespan-reporting = { workspace = true, features = ["serde", "serialization"] }
 ethnum = { workspace = true }
 flexi_logger = { workspace = true }
-im = "15.0.0"
+im = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true, features = ["serde"] }
+move-binary-format = { workspace = true }
+move-borrow-graph = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-bytecode-verifier = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-core-types = { workspace = true }
+move-disassembler = { workspace = true }
+move-ir-types = { workspace = true }
+move-model = { workspace = true }
+move-stackless-bytecode = { workspace = true }
+move-symbol-pool = { workspace = true }
 num = { workspace = true }
 once_cell = { workspace = true }
-#paste = "1.0.5"
 petgraph = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true }
 datatest-stable = { workspace = true }
-move-command-line-common = { path = "../move-command-line-common" }
-move-ir-types = { path = "../move-ir/types" }
+move-command-line-common = { workspace = true }
+move-ir-types = { workspace = true }
 move-prover-test-utils = { path = "../move-prover/test-utils" }
 move-stdlib = { path = "../move-stdlib" }
 walkdir = { workspace = true }

diff --git a/third_party/move/move-compiler-v2/transactional-tests/Cargo.toml b/third_party/move/move-compiler-v2/transactional-tests/Cargo.toml
@@ -7,15 +7,15 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-move-command-line-common = { path = "../../move-command-line-common" }
+move-command-line-common = { workspace = true }
 once_cell = { workspace = true }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
 itertools = { workspace = true }
-move-compiler-v2 = { path = ".." }
-move-model = { path = "../../move-model" }
-move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner" }
+move-compiler-v2 = { workspace = true }
+move-model = { workspace = true }
+move-transactional-test-runner = { workspace = true }
 walkdir = { workspace = true }
 
 [[test]]

diff --git a/third_party/move/move-compiler/Cargo.toml b/third_party/move/move-compiler/Cargo.toml
@@ -19,15 +19,15 @@ tempfile = { workspace = true }
 
 bcs = { workspace = true }
 
-move-binary-format = { path = "../move-binary-format" }
-move-borrow-graph = { path = "../move-borrow-graph" }
-move-bytecode-source-map = { path = "../move-ir-compiler/move-bytecode-source-map" }
-move-bytecode-verifier = { path = "../move-bytecode-verifier" }
-move-command-line-common = { path = "../move-command-line-common" }
-move-core-types = { path = "../move-core/types" }
-move-ir-to-bytecode = { path = "../move-ir-compiler/move-ir-to-bytecode" }
-move-ir-types = { path = "../move-ir/types" }
-move-symbol-pool = { path = "../move-symbol-pool" }
+move-binary-format = { workspace = true }
+move-borrow-graph = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-bytecode-verifier = { workspace = true }
+move-command-line-common = { workspace = true }
+move-core-types = { workspace = true }
+move-ir-to-bytecode = { workspace = true }
+move-ir-types = { workspace = true }
+move-symbol-pool = { workspace = true }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }

diff --git a/third_party/move/move-compiler/TODO b/third_party/move/move-compiler/TODO