Allow directly calling the data_struct function with Option type. (#1773

) * allow directly calling the data_struct function with Option type add missed exp file * cargo clippy --------- Co-authored-by: stevenlaw123 <[email protected]>
rooch-network · May 30, 2024 · d1e73c2 · d1e73c2
1 parent cf8535b
commit d1e73c2
Show file tree

Hide file tree

Showing 7 changed files with 220 additions and 112 deletions.
diff --git a/...mvir_tests/data_struct_func/data_struct_func_invalid_move_std_option_option_as_struct.exp b/...mvir_tests/data_struct_func/data_struct_func_invalid_move_std_option_option_as_struct.exp
diff --git a/...s/mvir_tests/data_struct_func/data_struct_func_valid_move_std_option_option_as_struct.exp b/...s/mvir_tests/data_struct_func/data_struct_func_valid_move_std_option_option_as_struct.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 1-39:
+status EXECUTED
diff --git a/...lid_move_std_option_option_as_struct.mvir → ...lid_move_std_option_option_as_struct.mvir b/...lid_move_std_option_option_as_struct.mvir → ...lid_move_std_option_option_as_struct.mvir
diff --git a/moveos/moveos-verifier/src/build.rs b/moveos/moveos-verifier/src/build.rs
@@ -1,7 +1,10 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::metadata::{run_extended_checks, RuntimeModuleMetadataV1};
+use crate::metadata::{
+    run_extended_checks, RuntimeModuleMetadataV1, DATA_STRUCT_ATTRIBUTE,
+    DATA_STRUCT_FUNC_ATTRIBUTE, PRIVATE_GENERICS_ATTRIBUTE,
+};
 use codespan_reporting::diagnostic::Severity;
 use itertools::Itertools;
 use move_binary_format::CompiledModule;
@@ -396,7 +399,7 @@ pub fn compile_and_inject_metadata(
 
     let mut rooch_metadata = RuntimeModuleMetadataV1::default();
     for (metadata_type, metadata_item) in ast_metadata.value {
-        if metadata_type == "private_generics" {
+        if metadata_type == PRIVATE_GENERICS_ATTRIBUTE {
             let mut private_generics_map: BTreeMap<String, Vec<usize>> = BTreeMap::new();
             for (metadata_key, metadata_value) in metadata_item.iter() {
                 let mut generic_type_indices: Vec<usize> = Vec::new();
@@ -414,7 +417,7 @@ pub fn compile_and_inject_metadata(
             rooch_metadata.private_generics_indices = private_generics_map;
         }
 
-        if metadata_type == "data_struct" {
+        if metadata_type == DATA_STRUCT_ATTRIBUTE {
             let mut data_structs_map: BTreeMap<String, bool> = BTreeMap::new();
             for (metadata_key, metadata_value) in metadata_item.iter() {
                 for idx_expr in metadata_value.iter() {
@@ -430,7 +433,7 @@ pub fn compile_and_inject_metadata(
             rooch_metadata.data_struct_map = data_structs_map;
         }
 
-        if metadata_type == "data_struct_func" {
+        if metadata_type == DATA_STRUCT_FUNC_ATTRIBUTE {
             let mut data_struct_func_map: BTreeMap<String, Vec<usize>> = BTreeMap::new();
             for (metadata_key, metadata_value) in metadata_item.iter() {
                 let mut generic_type_indices: Vec<usize> = Vec::new();

diff --git a/moveos/moveos-verifier/src/error_code.rs b/moveos/moveos-verifier/src/error_code.rs
@@ -62,6 +62,8 @@ pub enum ErrorCode {
     INVALID_DATA_STRUCT_WITHOUT_COPY_ABILITY = 10013,
     INVALID_DATA_STRUCT_NOT_ALLOWED_TYPE = 10014,
     INVALID_DATA_STRUCT_NOT_IN_MODULE_METADATA = 10015,
+    INVALID_DATA_STRUCT_WITH_TYPE_PARAMETER = 10016,
+    INVALID_DATA_STRUCT_OPTION_WITHOUT_TYPE_PARAMETER = 10017,
 
     INVALID_ENTRY_FUNC_SIGNATURE = 11000,
     INVALID_PARAM_TYPE_ENTRY_FUNCTION = 11001,

diff --git a/moveos/moveos-verifier/src/metadata.rs b/moveos/moveos-verifier/src/metadata.rs
@@ -42,13 +42,15 @@ pub static mut GLOBAL_DATA_STRUCT_FUNC: GlobalVariableWithRWLocker<BTreeMap<Stri
 pub static mut GLOBAL_GAS_FREE_RECORDER: Lazy<BTreeMap<String, Vec<usize>>> =
     Lazy::new(|| BTreeMap::new());
 
-const PRIVATE_GENERICS_ATTRIBUTE: &str = "private_generics";
+pub const PRIVATE_GENERICS_ATTRIBUTE: &str = "private_generics";
 
 const GAS_FREE_ATTRIBUTE: &str = "gas_free";
 const GAS_FREE_VALIDATE: &str = "gas_validate";
 const GAS_FREE_CHARGE_POST: &str = "gas_charge_post";
 
-const DATA_STRUCT_ATTRIBUTE: &str = "data_struct";
+pub const DATA_STRUCT_ATTRIBUTE: &str = "data_struct";
+
+pub const DATA_STRUCT_FUNC_ATTRIBUTE: &str = "data_struct_func";
 
 /// Enumeration of potentially known attributes
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]