fix mvir tests + expectations (MystenLabs#2571)

olegnodata · Jun 15, 2022 · fbe7b8e · fbe7b8e
1 parent 8ceb58b
commit fbe7b8e
Show file tree

Hide file tree

Showing 85 changed files with 206 additions and 197 deletions.
diff --git a/...sui-verifier-transactional-tests/tests/entry_points/generic_and_generic_object_params.exp b/...sui-verifier-transactional-tests/tests/entry_points/generic_and_generic_object_params.exp
@@ -1,4 +1,5 @@
 processed 1 task
 
 task 0 'publish'. lines 4-16:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+created: object(103)
+written: object(102)
diff --git a/...ui-verifier-transactional-tests/tests/entry_points/generic_and_generic_object_params.mvir b/...ui-verifier-transactional-tests/tests/entry_points/generic_and_generic_object_params.mvir
@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
-    import 0x2.ID;
+module 0x0.m {
+    import 0x2.id;
     import 0x2.tx_context;
     struct Obj<T> has key {
-        id: ID.VersionedID,
+        id: id.VersionedID,
     }
     public entry foo<T0: key, T1: store>(l0: T0, l1: Self.Obj<T1>, c: &mut tx_context.TxContext) {
         label l0:

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/generic_param_after_primitive.exp b/crates/sui-verifier-transactional-tests/tests/entry_points/generic_param_after_primitive.exp
@@ -1,4 +1,5 @@
 processed 1 task
 
 task 0 'publish'. lines 4-16:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+created: object(103)
+written: object(102)
diff --git a/...es/sui-verifier-transactional-tests/tests/entry_points/generic_param_after_primitive.mvir b/...es/sui-verifier-transactional-tests/tests/entry_points/generic_param_after_primitive.mvir
@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
-    import 0x2.ID;
+module 0x0.m {
+    import 0x2.id;
     import 0x2.tx_context;
     struct Obj has key {
-        id: ID.VersionedID,
+        id: id.VersionedID,
     }
     public entry foo<T>(l0: Self.Obj, l1: u64, l2: T, ctx: &mut tx_context.TxContext) {
         label l0:

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/generic_with_key_invalid.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/generic_with_key_invalid.mvir
@@ -4,7 +4,7 @@
 // invalid, type parameters with key are not valid when nested as no primitive has key
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
     import 0x1.option;
 
@@ -16,7 +16,7 @@ module 0x0.M {
 }
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
     import 0x1.option;
 

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/generic_with_key_valid.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/generic_with_key_valid.mvir
@@ -4,7 +4,7 @@
 // valid, type parameters with key are valid as long as they are not nested
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
     import 0x1.option;
 

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/id.exp b/crates/sui-verifier-transactional-tests/tests/entry_points/id.exp
@@ -1,4 +1,5 @@
 processed 1 task
 
 task 0 'publish'. lines 6-21:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+created: object(103)
+written: object(102)
diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/id.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/id.mvir
@@ -4,14 +4,14 @@
 // valid, ID is allowed
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
-    import 0x2.ID;
+    import 0x2.id;
 
     public entry yes<T>(
-        l0: ID.ID,
-        l1: vector<ID.ID>,
-        l2: vector<vector<ID.ID>>,
+        l0: id.ID,
+        l1: vector<id.ID>,
+        l2: vector<vector<id.ID>>,
         ctx: &mut tx_context.TxContext,
     ) {
         label l0:

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/nested_generic_vector_param.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/nested_generic_vector_param.mvir
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
 
     public entry foo<T>(l: vector<vector<T>>, ctx: &mut tx_context.TxContext) {

diff --git a/.../sui-verifier-transactional-tests/tests/entry_points/nested_key_generic_vector_param.mvir b/.../sui-verifier-transactional-tests/tests/entry_points/nested_key_generic_vector_param.mvir
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
 
     public entry foo<T: key>(l: vector<vector<T>>, ctx: &mut tx_context.TxContext) {

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct.exp b/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct.exp
@@ -1,4 +1,4 @@
 processed 1 task
 
 task 0 'publish'. lines 6-17:
-Error: Failed to verify the Move module, reason: "Invalid entry point parameter type. Expected primitive or object type. Got: _::M::S".
+Error: Failed to verify the Move module, reason: "Invalid entry point parameter type. Expected primitive or object type. Got: _::m::S".
diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct.mvir
@@ -4,7 +4,7 @@
 // invalid, non key structs are not supported
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
 
     struct S has copy, drop, store { value: u64 }

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_generic.exp b/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_generic.exp
@@ -1,7 +1,7 @@
 processed 2 tasks
 
 task 0 'publish'. lines 6-21:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+Error: Failed to verify the Move module, reason: "Invalid entry point parameter type. Expected primitive or object type. Got: _::m::Obj<_::m::NoStore>".
 
 task 1 'publish'. lines 23-35:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+Error: Failed to verify the Move module, reason: "Invalid entry point parameter type. Expected primitive or object type. Got: _::m::Obj<T0>".
diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_generic.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_generic.mvir
@@ -4,11 +4,11 @@
 // invalid as NoStore doesn't have store, so Obj doesn't have key
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
-    import 0x2.ID;
+    import 0x2.id;
 
-    struct Obj<T> has key { id: ID.VersionedID }
+    struct Obj<T> has key { id: id.VersionedID }
     struct NoStore has copy, drop { value: u64 }
 
     public entry no(s: Self.Obj<Self.NoStore>, ctx: &mut tx_context.TxContext) {
@@ -21,11 +21,11 @@ module 0x0.M {
 // valid, while T doesn't have store, and might it later, we require it to be annotated
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
-    import 0x2.ID;
+    import 0x2.id;
 
-    struct Obj<T> has key { id: ID.VersionedID }
+    struct Obj<T> has key { id: id.VersionedID }
 
     public entry no<T>(s: Self.Obj<T>, ctx: &mut tx_context.TxContext) {
         label l0:

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_generic_valid.exp b/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_generic_valid.exp
@@ -1,4 +1,5 @@
 processed 1 task
 
 task 0 'publish'. lines 6-18:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+created: object(103)
+written: object(102)
diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_generic_valid.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_generic_valid.mvir
@@ -4,11 +4,11 @@
 // valid, T has store, thus Obj has key
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
-    import 0x2.ID;
+    import 0x2.id;
 
-    struct Obj<T> has key { id: ID.VersionedID }
+    struct Obj<T> has key { id: id.VersionedID }
 
     public entry no<T: store>(s: Self.Obj<T>, ctx: &mut tx_context.TxContext) {
         label l0:

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_vector.exp b/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_vector.exp
@@ -1,4 +1,4 @@
 processed 1 task
 
 task 0 'publish'. lines 6-17:
-Error: Failed to verify the Move module, reason: "Invalid entry point parameter type. Expected primitive or object type. Got: vector<_::M::S>".
+Error: Failed to verify the Move module, reason: "Invalid entry point parameter type. Expected primitive or object type. Got: vector<_::m::S>".
diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_vector.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/non_key_struct_vector.mvir
@@ -4,7 +4,7 @@
 // invalid, non key structs are not supported, even in vectors
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
 
     struct S has copy, drop, store { value: u64 }

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/option.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/option.mvir
@@ -4,7 +4,7 @@
 // valid, option of primitives is allowed
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
     import 0x1.option;
 

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/optional_txn_context.exp b/crates/sui-verifier-transactional-tests/tests/entry_points/optional_txn_context.exp
@@ -5,4 +5,5 @@ created: object(103)
 written: object(102)
 
 task 1 'publish'. lines 14-23:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+created: object(105)
+written: object(104)
diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/optional_txn_context.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/optional_txn_context.mvir
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
     public entry t() {
         label l0:
@@ -12,10 +12,10 @@ module 0x0.M {
 
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
-    import 0x2.ID;
-    struct Obj has key { id: ID.VersionedID }
+    import 0x2.id;
+    struct Obj has key { id: id.VersionedID }
     public entry t(flag: bool, arg: &mut Self.Obj) {
         label l0:
         abort 0;

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/return_values.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/return_values.mvir
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
     public entry foo(ctx: &mut tx_context.TxContext): u64 {
         label l0:
@@ -11,7 +11,7 @@ module 0x0.M {
 }
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
     public entry foo(ctx: &mut tx_context.TxContext): u64 * u8 {
         label l0:
@@ -20,7 +20,7 @@ module 0x0.M {
 }
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
     public entry foo(ctx: &mut tx_context.TxContext): vector<u8> {
         label l0:
@@ -30,7 +30,7 @@ module 0x0.M {
 
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
     public entry foo(ctx: &mut tx_context.TxContext): &u8 {
         label l0:

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/single_generic_vector_param.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/single_generic_vector_param.mvir
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
 
     public entry foo<T>(l: vector<T>, ctx: &mut tx_context.TxContext) {

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/single_type_param.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/single_type_param.mvir
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
 
     public entry foo<T>(l: T, ctx: &mut tx_context.TxContext) {

diff --git a/.../sui-verifier-transactional-tests/tests/entry_points/single_type_param_generic_object.exp b/.../sui-verifier-transactional-tests/tests/entry_points/single_type_param_generic_object.exp
@@ -1,4 +1,5 @@
 processed 1 task
 
 task 0 'publish'. lines 4-16:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+created: object(103)
+written: object(102)
diff --git a/...sui-verifier-transactional-tests/tests/entry_points/single_type_param_generic_object.mvir b/...sui-verifier-transactional-tests/tests/entry_points/single_type_param_generic_object.mvir
@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
-    import 0x2.ID;
+module 0x0.m {
+    import 0x2.id;
     import 0x2.tx_context;
     struct Obj<T> has key {
-        id: ID.VersionedID,
+        id: id.VersionedID,
     }
     public entry foo<T: store>(l: Self.Obj<T>, ctx: &mut tx_context.TxContext) {
         label l0:

diff --git a/crates/sui-verifier-transactional-tests/tests/entry_points/single_type_param_key.mvir b/crates/sui-verifier-transactional-tests/tests/entry_points/single_type_param_key.mvir
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
+module 0x0.m {
     import 0x2.tx_context;
 
     public entry foo<T: key>(l: T, ctx: &mut tx_context.TxContext) {

diff --git a/crates/sui-verifier-transactional-tests/tests/global_storage_access/all.exp b/crates/sui-verifier-transactional-tests/tests/global_storage_access/all.exp
@@ -1,4 +1,4 @@
 processed 1 task
 
 task 0 'publish'. lines 4-31:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+Error: Failed to verify the Move module, reason: "Access to Move global storage is not allowed. Found in function no: [Exists(StructDefinitionIndex(0)), ExistsGeneric(StructDefInstantiationIndex(0)), ImmBorrowGlobal(StructDefinitionIndex(0)), ImmBorrowGlobalGeneric(StructDefInstantiationIndex(0)), MutBorrowGlobal(StructDefinitionIndex(0)), MutBorrowGlobalGeneric(StructDefInstantiationIndex(0)), MoveFrom(StructDefinitionIndex(0)), MoveFromGeneric(StructDefInstantiationIndex(0)), MoveTo(StructDefinitionIndex(0)), MoveToGeneric(StructDefInstantiationIndex(0))]".
diff --git a/crates/sui-verifier-transactional-tests/tests/global_storage_access/all.mvir b/crates/sui-verifier-transactional-tests/tests/global_storage_access/all.mvir
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
-    import 0x2.ID;
-    struct R has key { id: ID.VersionedID }
-    struct G<phantom T> has key { id: ID.VersionedID }
+module 0x0.m {
+    import 0x2.id;
+    struct R has key { id: id.VersionedID }
+    struct G<phantom T> has key { id: id.VersionedID }
 
 
     no<T>(s: &signer, addr: address, r: Self.R, g: Self.G<T>) acquires R, G {

diff --git a/crates/sui-verifier-transactional-tests/tests/global_storage_access/borrow_global.exp b/crates/sui-verifier-transactional-tests/tests/global_storage_access/borrow_global.exp
@@ -1,7 +1,7 @@
 processed 2 tasks
 
 task 0 'publish'. lines 4-15:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+Error: Failed to verify the Move module, reason: "Access to Move global storage is not allowed. Found in function no: [ImmBorrowGlobal(StructDefinitionIndex(0))]".
 
 task 1 'publish'. lines 17-27:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+Error: Failed to verify the Move module, reason: "Access to Move global storage is not allowed. Found in function no: [ImmBorrowGlobalGeneric(StructDefInstantiationIndex(0))]".
diff --git a/crates/sui-verifier-transactional-tests/tests/global_storage_access/borrow_global.mvir b/crates/sui-verifier-transactional-tests/tests/global_storage_access/borrow_global.mvir
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //# publish
-module 0x0.M {
-    import 0x2.ID;
-    struct R has key { id: ID.VersionedID }
+module 0x0.m {
+    import 0x2.id;
+    struct R has key { id: id.VersionedID }
 
     no(addr: address) acquires R {
         label l0:
@@ -15,9 +15,9 @@ module 0x0.M {
 }
 
 //# publish
-module 0x0.M {
-    import 0x2.ID;
-    struct R<phantom T> has key { id: ID.VersionedID }
+module 0x0.m {
+    import 0x2.id;
+    struct R<phantom T> has key { id: id.VersionedID }
 
     no<T>(addr: address) acquires R {
         label l0:

diff --git a/crates/sui-verifier-transactional-tests/tests/global_storage_access/borrow_global_mut.exp b/crates/sui-verifier-transactional-tests/tests/global_storage_access/borrow_global_mut.exp
@@ -1,7 +1,7 @@
 processed 2 tasks
 
 task 0 'publish'. lines 4-15:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+Error: Failed to verify the Move module, reason: "Access to Move global storage is not allowed. Found in function no: [MutBorrowGlobal(StructDefinitionIndex(0))]".
 
 task 1 'publish'. lines 17-27:
-Error: Dependency not provided for 0000000000000000000000000000000000000002.ID
+Error: Failed to verify the Move module, reason: "Access to Move global storage is not allowed. Found in function no: [MutBorrowGlobalGeneric(StructDefInstantiationIndex(0))]".