[verifier] Migrate struct_with_key tests (MystenLabs#1991)

- Migrated to expected output tests

Cargo.toml

@@ -8,6 +8,7 @@ members = [
     "crates/sui-transactional-test-runner",
     "crates/sui-types",
     "crates/sui-verifier",
+    "crates/sui-verifier-transactional-tests",
     "crates/x",
     "sui",
     "sui/open_rpc",

crates/sui-adapter-transactional-tests/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sui-adapter-transactional-tests"
 version = "0.1.0"
 authors = ["Mysten Labs <[email protected]>"]
-description = "Adapter and accompanying CLI for local sui development"
+description = "Transactional tests for Sui Adapter"
 license = "Apache-2.0"
 publish = false
 edition = "2021"

crates/sui-transactional-test-runner/src/test_adapter.rs

@@ -205,10 +205,6 @@ impl<'a> MoveTestAdapter<'a> for SuiTestAdapter<'a> {
         extra: Self::ExtraPublishArgs,
     ) -> anyhow::Result<(Option<String>, CompiledModule)> {
         let SuiPublishArgs { sender } = extra;
-        let named_addr = named_addr_opt.expect(
-            "Cannot publish without a named address. \
-            This named address will be associated with the published package",
-        );
         let module_name = module.self_id().name().to_string();
         let module_bytes = {
             let mut buf = vec![];
@@ -234,17 +230,19 @@ impl<'a> MoveTestAdapter<'a> for SuiTestAdapter<'a> {
             })
             .unwrap();
         let package_addr = NumericalAddress::new(created_package.into_bytes(), NumberFormat::Hex);
-        let prev_package = self
-            .compiled_state
-            .named_address_mapping
-            .insert(named_addr.to_string(), package_addr);
-        match prev_package.map(|a| a.into_inner()) {
-            Some(addr) if addr != AccountAddress::ZERO => panic!(
-                "Cannot reuse named address '{}' for multiple packages. \
+        if let Some(named_addr) = named_addr_opt {
+            let prev_package = self
+                .compiled_state
+                .named_address_mapping
+                .insert(named_addr.to_string(), package_addr);
+            match prev_package.map(|a| a.into_inner()) {
+                Some(addr) if addr != AccountAddress::ZERO => panic!(
+                    "Cannot reuse named address '{}' for multiple packages. \
                 It should be set to 0 initially",
-                named_addr
-            ),
-            _ => (),
+                    named_addr
+                ),
+                _ => (),
+            }
         }
         let view_events = false;
         let output = self.object_summary_output(&summary, view_events);

crates/sui-verifier-transactional-tests/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "sui-verifier-transactional-tests"
+version = "0.1.0"
+authors = ["Mysten Labs <[email protected]>"]
+description = "Transactional tests for Sui Verifier"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dev-dependencies]
+datatest-stable = "0.1.1"
+sui-transactional-test-runner = { path = "../sui-transactional-test-runner" }
+
+[[test]]
+name = "tests"
+harness = false

crates/sui-verifier-transactional-tests/src/lib.rs

@@ -0,0 +1,6 @@
+// Copyright (c) 2022, Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+// Empty src/lib.rs to get rusty-tags working.

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_first_field_not_id.exp

@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 4-10:
+Error: Failed to verify the Move module, reason: "First field of struct S must be 'id', flag found".

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_first_field_not_id.mvir

@@ -0,0 +1,10 @@
+// Copyright (c) 2022, Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# publish
+module 0x0.M {
+    import 0x2.ID;
+    struct S has key {
+        flag: bool
+    }
+}

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_id_field_incorrect_struct_address.exp

@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 4-11:
+Error: Failed to verify the Move module, reason: "First field of struct S must be of type Sui::ID::VersionedID, _::ID::VersionedID type found".

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_id_field_incorrect_struct_address.mvir

@@ -0,0 +1,11 @@
+// Copyright (c) 2022, Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# publish
+module 0x0.ID {
+    import 0x2.ID;
+    struct VersionedID has store { flag: bool }
+    struct S has key {
+        id: Self.VersionedID
+    }
+}

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_id_field_incorrect_struct_name.exp

@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 4-10:
+Error: Failed to verify the Move module, reason: "First field of struct S must be of type Sui::ID::VersionedID, Sui::ID::ID type found".

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_id_field_incorrect_struct_name.mvir

@@ -0,0 +1,10 @@
+// Copyright (c) 2022, Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# publish
+module 0x0.M {
+    import 0x2.ID;
+    struct S has key {
+        id: ID.ID
+    }
+}

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_id_field_incorrect_type.exp

@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 4-10:
+Error: Failed to verify the Move module, reason: "First field of struct S must be of ID type, Bool type found".

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_id_field_incorrect_type.mvir

@@ -0,0 +1,10 @@
+// Copyright (c) 2022, Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# publish
+module 0x0.M {
+    import 0x2.ID;
+    struct S has key {
+        id: bool
+    }
+}

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_id_field_valid.exp

@@ -0,0 +1,5 @@
+processed 1 task
+
+task 0 'publish'. lines 4-10:
+created: object(103)
+written: object(102)

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_id_field_valid.mvir

@@ -0,0 +1,10 @@
+// Copyright (c) 2022, Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# publish
+module 0x0.M {
+    import 0x2.ID;
+    struct S has key {
+        id: ID.VersionedID
+    }
+}

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_second_field_id.exp

@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 4-11:
+Error: Failed to verify the Move module, reason: "First field of struct S must be 'id', flag found".

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_second_field_id.mvir

@@ -0,0 +1,11 @@
+// Copyright (c) 2022, Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# publish
+module 0x0.M {
+    import 0x2.ID;
+    struct S has key {
+        flag: bool,
+        id: ID.VersionedID,
+    }
+}

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_with_drop.exp

@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 4-10:
+Error: Failed to verify the Move module, reason: "Struct S cannot have both key and drop abilities".

crates/sui-verifier-transactional-tests/tests/struct_with_key/key_struct_with_drop.mvir

@@ -0,0 +1,10 @@
+// Copyright (c) 2022, Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# publish
+module 0x0.M {
+    import 0x2.ID;
+    struct S has key, drop {
+        flag: bool
+    }
+}

crates/sui-verifier-transactional-tests/tests/tests.rs

@@ -0,0 +1,7 @@
+// Copyright (c) 2022, Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+pub const TEST_DIR: &str = "tests";
+use sui_transactional_test_runner::run_test;
+
+datatest_stable::harness!(run_test, TEST_DIR, r".*\.(mvir|move)$");