[11/n][vm-rewrite] Move the old move-vm-types

Moves `move/move-execution/shared/crates/move-vm-types` to `move/crates/legacy-move-vm-types` and updates paths in other parts of the codebase based on this change. No semantic changes.
MystenLabs · Feb 11, 2025 · 7b669ec · 7b669ec
1 parent f301cc6
commit 7b669ec
Show file tree

Hide file tree

Showing 174 changed files with 225 additions and 211 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -567,6 +567,7 @@ move-disassembler = { path = "external-crates/move/crates/move-disassembler" }
 move-package = { path = "external-crates/move/crates/move-package" }
 move-unit-test = { path = "external-crates/move/crates/move-unit-test" }
 move-vm-config = { path = "external-crates/move/crates/move-vm-config" }
+legacy-move-vm-types = { path = "external-crates/move/crates/legacy-move-vm-types" }
 ## TODO(vm-rewrite): we need to have a better execution versioning story here as just relying on the vm-runtime directly is not kosher...
 move-vm-runtime = { path = "external-crates/move/crates/move-vm-runtime/", features = [
     "tiered-gas",

diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml
@@ -76,8 +76,7 @@ lru.workspace = true
 
 sui-sdk-types.workspace = true
 
-## TODO(vm-rewrite): Determine where to place the historical trait implementation of the `GasMeter` trait, and this will determine whether we remove this, or if we want to add it to the workspace officially.
-move-vm-types-old = { path = "../../external-crates/move/move-execution/shared/crates/move-vm-types", package = "move-vm-types" }
+legacy-move-vm-types.workspace = true 
 
 [dev-dependencies]
 bincode.workspace = true

diff --git a/crates/sui-types/src/gas_model/tables.rs b/crates/sui-types/src/gas_model/tables.rs
@@ -944,7 +944,6 @@ pub fn initial_cost_schedule_for_unit_tests() -> TestCostTable {
     }
 }
 
-// TODO(vm-rewrite): Move this to a better place. Possibly under `sui-execution`?
 mod old_versions {
     use crate::gas_model::gas_predicates::native_function_threshold_exceeded;
     use crate::gas_model::gas_predicates::use_legacy_abstract_size;
@@ -955,17 +954,17 @@ mod old_versions {
         GasStatus, BOOL_SIZE, REFERENCE_SIZE, U128_SIZE, U16_SIZE, U256_SIZE, U32_SIZE, U64_SIZE,
         U8_SIZE,
     };
+    use legacy_move_vm_types::gas::GasMeter;
+    use legacy_move_vm_types::gas::SimpleInstruction;
+    use legacy_move_vm_types::views::TypeView;
+    use legacy_move_vm_types::views::ValueView;
     use move_binary_format::errors::PartialVMResult;
     use move_core_types::gas_algebra::AbstractMemorySize;
     use move_core_types::gas_algebra::InternalGas;
     use move_core_types::gas_algebra::NumArgs;
     use move_core_types::gas_algebra::NumBytes;
     use move_core_types::language_storage::ModuleId;
     use move_vm_profiler::GasProfiler;
-    use move_vm_types_old::gas::GasMeter;
-    use move_vm_types_old::gas::SimpleInstruction;
-    use move_vm_types_old::views::TypeView;
-    use move_vm_types_old::views::ValueView;
 
     /// Returns a tuple of (<pops>, <pushes>, <stack_size_decrease>, <stack_size_increase>)
     fn get_simple_instruction_stack_change(

diff --git a/external-crates/move/Cargo.lock b/external-crates/move/Cargo.lock
diff --git a/external-crates/move/Cargo.toml b/external-crates/move/Cargo.toml
@@ -176,6 +176,7 @@ move-vm-config = { path = "crates/move-vm-config" }
 move-vm-profiler = { path = "crates/move-vm-profiler" }
 move-vm-runtime = { path = "crates/move-vm-runtime" }
 prover_bytecode = { path = "crates/move-stackless-bytecode", package="move-stackless-bytecode" }
+legacy-move-vm-types = { path = "crates/legacy-move-vm-types" }
 
 [profile.bench]
 debug = true

diff --git a/...on/shared/crates/move-vm-types/Cargo.toml → ...ve/crates/legacy-move-vm-types/Cargo.toml b/...on/shared/crates/move-vm-types/Cargo.toml → ...ve/crates/legacy-move-vm-types/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "move-vm-types"
+name = "legacy-move-vm-types"
 version = "0.1.0"
 authors = ["Diem Association <[email protected]>"]
-description = "Types for Move VM"
+description = "Legacy (pre-rewrite) Types for Move VM"
 repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"

diff --git a/...ed/crates/move-vm-types/src/data_store.rs → ...es/legacy-move-vm-types/src/data_store.rs b/...ed/crates/move-vm-types/src/data_store.rs → ...es/legacy-move-vm-types/src/data_store.rs
diff --git a/...on/shared/crates/move-vm-types/src/gas.rs → ...ve/crates/legacy-move-vm-types/src/gas.rs b/...on/shared/crates/move-vm-types/src/gas.rs → ...ve/crates/legacy-move-vm-types/src/gas.rs
diff --git a/...on/shared/crates/move-vm-types/src/lib.rs → ...ve/crates/legacy-move-vm-types/src/lib.rs b/...on/shared/crates/move-vm-types/src/lib.rs → ...ve/crates/legacy-move-vm-types/src/lib.rs
diff --git a/...ates/move-vm-types/src/loaded_data/mod.rs → ...gacy-move-vm-types/src/loaded_data/mod.rs b/...ates/move-vm-types/src/loaded_data/mod.rs → ...gacy-move-vm-types/src/loaded_data/mod.rs
diff --git a/...vm-types/src/loaded_data/runtime_types.rs → ...vm-types/src/loaded_data/runtime_types.rs b/...vm-types/src/loaded_data/runtime_types.rs → ...vm-types/src/loaded_data/runtime_types.rs
diff --git a/...tes/move-vm-types/src/natives/function.rs → ...acy-move-vm-types/src/natives/function.rs b/...tes/move-vm-types/src/natives/function.rs → ...acy-move-vm-types/src/natives/function.rs
diff --git a/...d/crates/move-vm-types/src/natives/mod.rs → ...s/legacy-move-vm-types/src/natives/mod.rs b/...d/crates/move-vm-types/src/natives/mod.rs → ...s/legacy-move-vm-types/src/natives/mod.rs
diff --git a/...s/src/unit_tests/identifier_prop_tests.rs → ...s/src/unit_tests/identifier_prop_tests.rs b/...s/src/unit_tests/identifier_prop_tests.rs → ...s/src/unit_tests/identifier_prop_tests.rs
diff --git a/...rates/move-vm-types/src/unit_tests/mod.rs → ...egacy-move-vm-types/src/unit_tests/mod.rs b/...rates/move-vm-types/src/unit_tests/mod.rs → ...egacy-move-vm-types/src/unit_tests/mod.rs
diff --git a/...ed/crates/move-vm-types/src/values/mod.rs → ...es/legacy-move-vm-types/src/values/mod.rs b/...ed/crates/move-vm-types/src/values/mod.rs → ...es/legacy-move-vm-types/src/values/mod.rs
diff --git a/...e-vm-types/src/values/value_prop_tests.rs → ...e-vm-types/src/values/value_prop_tests.rs b/...e-vm-types/src/values/value_prop_tests.rs → ...e-vm-types/src/values/value_prop_tests.rs
diff --git a/...s/move-vm-types/src/values/value_tests.rs → ...y-move-vm-types/src/values/value_tests.rs b/...s/move-vm-types/src/values/value_tests.rs → ...y-move-vm-types/src/values/value_tests.rs
diff --git a/...s/move-vm-types/src/values/values_impl.rs → ...y-move-vm-types/src/values/values_impl.rs b/...s/move-vm-types/src/values/values_impl.rs → ...y-move-vm-types/src/values/values_impl.rs
diff --git a/.../shared/crates/move-vm-types/src/views.rs → .../crates/legacy-move-vm-types/src/views.rs b/.../shared/crates/move-vm-types/src/views.rs → .../crates/legacy-move-vm-types/src/views.rs
diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/Cargo.toml b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 [dependencies]
 move-binary-format.workspace = true
 move-core-types.workspace = true
-move-vm-types = { path = "../../../shared/crates/move-vm-types" }
+legacy-move-vm-types.workspace = true
 move-vm-runtime = { path = "../move-vm-runtime", package = "move-vm-runtime-v0" }
 smallvec.workspace = true
 sha2.workspace = true

diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/bcs.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/bcs.rs
@@ -12,7 +12,7 @@ use move_vm_runtime::{
     native_charge_gas_early_exit,
     native_functions::{NativeContext, NativeFunction},
 };
-use move_vm_types::{
+use legacy_move_vm_types::{
     loaded_data::runtime_types::Type,
     natives::function::NativeResult,
     pop_arg,

diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/debug.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/debug.rs
@@ -7,7 +7,7 @@ use move_binary_format::errors::PartialVMResult;
 use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas};
 use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
 #[allow(unused_imports)]
-use move_vm_types::{
+use legacy_move_vm_types::{
     loaded_data::runtime_types::Type,
     natives::function::NativeResult,
     pop_arg,
@@ -197,7 +197,7 @@ mod testing {
         vm_status::StatusCode,
     };
     use move_vm_runtime::native_functions::NativeContext;
-    use move_vm_types::{loaded_data::runtime_types::Type, values::Value};
+    use legacy_move_vm_types::{loaded_data::runtime_types::Type, values::Value};
     use std::{fmt, fmt::Write};
 
     const VECTOR_BEGIN: &str = "[";

diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/hash.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/hash.rs
@@ -9,7 +9,7 @@ use move_vm_runtime::{
     native_charge_gas_early_exit,
     native_functions::{NativeContext, NativeFunction},
 };
-use move_vm_types::{
+use legacy_move_vm_types::{
     loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
 };
 use sha2::{Digest, Sha256};

diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/signer.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/signer.rs
@@ -9,7 +9,7 @@ use move_vm_runtime::{
     native_charge_gas_early_exit,
     native_functions::{NativeContext, NativeFunction},
 };
-use move_vm_types::{
+use legacy_move_vm_types::{
     loaded_data::runtime_types::Type,
     natives::function::NativeResult,
     pop_arg,

diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/string.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/string.rs
@@ -11,7 +11,7 @@ use move_vm_runtime::{
     native_charge_gas_early_exit,
     native_functions::{NativeContext, NativeFunction},
 };
-use move_vm_types::{
+use legacy_move_vm_types::{
     loaded_data::runtime_types::Type,
     natives::function::NativeResult,
     pop_arg,

diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/type_name.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/type_name.rs
@@ -7,7 +7,7 @@ use move_vm_runtime::{
     native_charge_gas_early_exit,
     native_functions::{NativeContext, NativeFunction},
 };
-use move_vm_types::{
+use legacy_move_vm_types::{
     loaded_data::runtime_types::Type,
     natives::function::NativeResult,
     values::{Struct, Value},

diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/unit_test.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/unit_test.rs
@@ -12,7 +12,7 @@ use move_vm_runtime::{
     native_charge_gas_early_exit,
     native_functions::{NativeContext, NativeFunction},
 };
-use move_vm_types::{
+use legacy_move_vm_types::{
     loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
 };
 use smallvec::smallvec;