Refactor the verifier and add more mvir tests. (#1742)

rooch-network · May 26, 2024 · 7a85750 · 7a85750
1 parent 89e35df
commit 7a85750
Show file tree

Hide file tree

Showing 26 changed files with 309 additions and 49 deletions.
diff --git a/...tests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_copy.exp b/...tests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_copy.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+status ABORTED with code 10013 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
diff --git a/...ests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_copy.mvir b/...ests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_copy.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.TestModule1 {
+    // error code 10013: INVALID_DATA_STRUCT_WITHOUT_COPY_ABILITY
+    struct S0 has drop {v: u64}
+
+    metadata {
+        data_struct {
+            0x1::TestModule1::S0 -> true;
+        }
+    }
+}
diff --git a/...tests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_drop.exp b/...tests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_drop.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+status ABORTED with code 10012 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
diff --git a/...ests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_drop.mvir b/...ests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_drop.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.TestModule1 {
+    // error code 10012: INVALID_DATA_STRUCT_WITHOUT_DROP_ABILITY
+    struct S0 has copy {v: u64}
+
+    metadata {
+        data_struct {
+            0x1::TestModule1::S0 -> true;
+        }
+    }
+}
diff --git a/...private_generics_invalid_module_owner.exp → ...ruct/data_struct_invalid_module_owner.exp b/...private_generics_invalid_module_owner.exp → ...ruct/data_struct_invalid_module_owner.exp
diff --git a/...-framework-tests/tests/cases/mvir_tests/data_struct/data_struct_invalid_module_owner.mvir b/...-framework-tests/tests/cases/mvir_tests/data_struct/data_struct_invalid_module_owner.mvir
@@ -0,0 +1,9 @@
+//# publish
+module 0x1.TestModule1 {
+    metadata {
+        data_struct {
+            // error code 10010: INVALID_MODULE_OWNER
+            0x123::SomeModule::Struct0 -> true;
+        }
+    }
+}
diff --git a/...sts/data_struct_malformed_struct_name.exp → ...uct/data_struct_malformed_struct_name.exp b/...sts/data_struct_malformed_struct_name.exp → ...uct/data_struct_malformed_struct_name.exp
diff --git a/...ts/data_struct_malformed_struct_name.mvir → ...ct/data_struct_malformed_struct_name.mvir b/...ts/data_struct_malformed_struct_name.mvir → ...ct/data_struct_malformed_struct_name.mvir
diff --git a/...rooch-framework-tests/tests/cases/mvir_tests/data_struct/data_struct_struct_not_exits.exp b/...rooch-framework-tests/tests/cases/mvir_tests/data_struct/data_struct_struct_not_exits.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+status ABORTED with code 10002 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
diff --git a/...ooch-framework-tests/tests/cases/mvir_tests/data_struct/data_struct_struct_not_exits.mvir b/...ooch-framework-tests/tests/cases/mvir_tests/data_struct/data_struct_struct_not_exits.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.TestModule1 {
+    struct S0 has drop { x: u64 }
+
+    metadata {
+        data_struct {
+            // error code 10002: STRUCT_NOT_EXISTS
+            0x1::TestModule1::S1 -> true;
+        }
+    }
+}
diff --git a/.../private_generics_function_not_exists.exp → .../private_generics_function_not_exists.exp b/.../private_generics_function_not_exists.exp → .../private_generics_function_not_exists.exp
diff --git a/...private_generics_function_not_exists.mvir → ...private_generics_function_not_exists.mvir b/...private_generics_function_not_exists.mvir → ...private_generics_function_not_exists.mvir
diff --git a/...k-tests/tests/cases/mvir_tests/private_generics/private_generics_invalid_module_owner.exp b/...k-tests/tests/cases/mvir_tests/private_generics/private_generics_invalid_module_owner.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 1-9:
+status ABORTED with code 10010 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
diff --git a/...rivate_generics_invalid_module_owner.mvir → ...rivate_generics_invalid_module_owner.mvir b/...rivate_generics_invalid_module_owner.mvir → ...rivate_generics_invalid_module_owner.mvir
@@ -3,7 +3,7 @@ module 0x1.TestModule1 {
     metadata {
         private_generics {
             // error code 10010: INVALID_MODULE_OWNER
-            0x123::SomeModule::f1 -> true;
+            0x123::SomeModule::f1 -> [0, 1];
         }
     }
 }
diff --git a/...vate_generics_malformed_function_name.exp → ...vate_generics_malformed_function_name.exp b/...vate_generics_malformed_function_name.exp → ...vate_generics_malformed_function_name.exp
diff --git a/...ate_generics_malformed_function_name.mvir → ...ate_generics_malformed_function_name.mvir b/...ate_generics_malformed_function_name.mvir → ...ate_generics_malformed_function_name.mvir
diff --git a/...s/tests/cases/mvir_tests/private_generics/private_generics_not_allowed_primitive_type.exp b/...s/tests/cases/mvir_tests/private_generics/private_generics_not_allowed_primitive_type.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 1-26:
+status ABORTED with code 10011 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
diff --git a/.../tests/cases/mvir_tests/private_generics/private_generics_not_allowed_primitive_type.mvir b/.../tests/cases/mvir_tests/private_generics/private_generics_not_allowed_primitive_type.mvir
@@ -0,0 +1,26 @@
+//# publish
+module 0x1.TestModule1 {
+    metadata {
+        private_generics {
+            0x1::TestModule1::f1 -> [0, 1];
+        }
+    }
+
+    public f1<T1: copy+drop, T2: copy+drop>(arg1: T1, arg2: T1) {
+        label b0:
+            _ = move(arg1);
+            _ = move(arg2);
+            return;
+    }
+
+    public f2() {
+        let a1: u32;
+        let a2: u32;
+        label b0:
+            a1 = 123u32;
+            a2 = 456u32;
+            // error code 10011: INVALID_PRIVATE_GENERICS_TYPE
+            Self.f1<u32, u32>(copy(a1), copy(a2));
+            return;
+    }
+}
diff --git a/...s/private_generics_not_allowed_struct.exp → ...s/private_generics_not_allowed_struct.exp b/...s/private_generics_not_allowed_struct.exp → ...s/private_generics_not_allowed_struct.exp
@@ -4,4 +4,4 @@ task 0 'publish'. lines 1-8:
 status EXECUTED
 
 task 1 'publish'. lines 10-36:
-status ABORTED with code 10008 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
+status ABORTED with code 10011 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
diff --git a/.../private_generics_not_allowed_struct.mvir → .../private_generics_not_allowed_struct.mvir b/.../private_generics_not_allowed_struct.mvir → .../private_generics_not_allowed_struct.mvir
@@ -29,7 +29,7 @@ module 0x1.TestModule1 {
         label b0:
             s0 = TestModule0.new();
             s1 = TestModule0.new();
-            // error code 10008: INVALID_DATA_STRUCT
+            // error code 10011: INVALID_PRIVATE_GENERICS_TYPE
             Self.f1<TestModule0.S0, TestModule0.S0>(move(s0), move(s1));
             return;
     }

diff --git a/...te_generics_not_enough_type_parameter.exp → ...te_generics_not_enough_type_parameter.exp b/...te_generics_not_enough_type_parameter.exp → ...te_generics_not_enough_type_parameter.exp
diff --git a/...e_generics_not_enough_type_parameter.mvir → ...e_generics_not_enough_type_parameter.mvir b/...e_generics_not_enough_type_parameter.mvir → ...e_generics_not_enough_type_parameter.mvir
diff --git a/...rk-tests/tests/cases/mvir_tests/private_generics/private_generics_too_many_parameters.exp b/...rk-tests/tests/cases/mvir_tests/private_generics/private_generics_too_many_parameters.exp
@@ -0,0 +1,7 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-8:
+status EXECUTED
+
+task 1 'publish'. lines 10-36:
+status ABORTED with code 10004 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
diff --git a/...k-tests/tests/cases/mvir_tests/private_generics/private_generics_too_many_parameters.mvir b/...k-tests/tests/cases/mvir_tests/private_generics/private_generics_too_many_parameters.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x1.TestModule0 {
+    struct S0 has drop { x: u64 }
+    public new(): Self.S0 {
+        label b0:
+            return S0{ x: 123 };
+    }
+}
+
+//# publish
+module 0x1.TestModule1 {
+    import 0x1.TestModule0;
+    metadata {
+        private_generics {
+            // error code 10004: TOO_MANY_PARAMETERS
+            0x1::TestModule1::f1 -> [1, 1, 1, 1, 1, 1];
+        }
+    }
+
+    public f1<T1: drop, T2: drop>(arg1: T1, arg2: T2) {
+        label b0:
+            _ = move(arg1);
+            _ = move(arg2);
+            return;
+    }
+
+    public f2() {
+        let s0: TestModule0.S0;
+        let s1: TestModule0.S0;
+        label b0:
+            s0 = TestModule0.new();
+            s1 = TestModule0.new();
+            Self.f1<TestModule0.S0, TestModule0.S0>(move(s0), move(s1));
+            return;
+    }
+}
diff --git a/moveos/moveos-verifier/src/error_code.rs b/moveos/moveos-verifier/src/error_code.rs
@@ -57,6 +57,9 @@ pub enum ErrorCode {
     INVALID_DATA_STRUCT = 10008,
     INVALID_DATA_STRUCT_TYPE = 10009,
     INVALID_MODULE_OWNER = 10010,
+    INVALID_PRIVATE_GENERICS_TYPE = 10011,
+    INVALID_DATA_STRUCT_WITHOUT_DROP_ABILITY = 10012,
+    INVALID_DATA_STRUCT_WITHOUT_COPY_ABILITY = 10013,
 
     INVALID_ENTRY_FUNC_SIGNATURE = 11000,
     INVALID_PARAM_TYPE_ENTRY_FUNCTION = 11001,