update move-abi and doc-gen test using v2

aptos-labs · Jan 10, 2025 · a1b900b · a1b900b
1 parent 87767e8
commit a1b900b
Show file tree

Hide file tree

Showing 18 changed files with 83 additions and 355 deletions.
diff --git a/third_party/move/move-prover/move-abigen/tests/sources/bad_script.exp b/third_party/move/move-prover/move-abigen/tests/sources/bad_script.exp
@@ -1,10 +1,6 @@
-Move prover abigen returns: exiting with model building errors
-error: incompatible types
-  ┌─ tests/sources/bad_script.move:3:9
+Move prover abigen returns: exiting with checking errors
+error: expected `u64` but found a value of type `bool`
+  ┌─ tests/sources/bad_script.move:3:15
   │
 3 │         abort true  // type error, abort code must be a u64
-  │         ^^^^^^^^^^
-  │         │     │
-  │         │     Given: 'bool'
-  │         Invalid abort
-  │         Expected: 'u64'
+  │               ^^^^
diff --git a/third_party/move/move-prover/move-abigen/tests/sources/script_fun_in_module.exp b/third_party/move/move-prover/move-abigen/tests/sources/script_fun_in_module.exp
@@ -1,17 +1,17 @@
-warning: unused variable
+warning: Unused parameter `account`. Consider removing or prefixing with an underscore: `_account`
    ┌─ tests/sources/script_fun_in_module.move:26:57
    │
 26 │     public entry fun this_is_script_fun_with_signer_ref(account: &signer, _another_arg: u64) { }
-   │                                                         ^^^^^^^ Unused parameter 'account'. Consider removing or prefixing with an underscore: '_account'
+   │                                                         ^^^^^^^
 
-warning: unused variable
+warning: Unused parameter `account`. Consider removing or prefixing with an underscore: `_account`
    ┌─ tests/sources/script_fun_in_module.move:29:53
    │
 29 │     public entry fun this_is_script_fun_with_signer(account: signer, _another_arg: u64) { }
-   │                                                     ^^^^^^^ Unused parameter 'account'. Consider removing or prefixing with an underscore: '_account'
+   │                                                     ^^^^^^^
 
-warning: unused variable
+warning: Unused parameter `account`. Consider removing or prefixing with an underscore: `_account`
    ┌─ tests/sources/script_fun_in_module.move:32:58
    │
 32 │     public entry fun this_is_script_fun_with_string_args(account: &signer, _val: String) { }
-   │                                                          ^^^^^^^ Unused parameter 'account'. Consider removing or prefixing with an underscore: '_account'
+   │                                                          ^^^^^^^
diff --git a/third_party/move/move-prover/move-abigen/tests/testsuite.rs b/third_party/move/move-prover/move-abigen/tests/testsuite.rs
@@ -5,7 +5,7 @@
 use codespan_reporting::term::termcolor::Buffer;
 #[allow(unused_imports)]
 use log::debug;
-use move_prover::{cli::Options, run_move_prover};
+use move_prover::{cli::Options, run_move_prover_v2};
 use move_prover_test_utils::baseline_test::verify_or_update_baseline;
 use std::{
     collections::BTreeSet,
@@ -64,7 +64,7 @@ fn test_abigen(path: &Path, mut options: Options, suffix: &str) -> anyhow::Resul
     };
 
     let mut error_writer = Buffer::no_color();
-    match run_move_prover(&mut error_writer, options) {
+    match run_move_prover_v2(&mut error_writer, options) {
         Ok(()) => {
             for abi_path in get_abi_paths_under_dir(&temp_path)?.iter() {
                 let mut contents = String::new();

diff --git a/...y/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_inline.md b/...y/move/move-prover/move-docgen/tests/sources/attribute_placement.spec_inline.md
@@ -169,9 +169,9 @@
 
 
 
-<a id="main"></a>
+<a id="<SELF>_0"></a>
 
-# Script `main`
+# Script `<SELF>_0`
 
 
 
@@ -193,18 +193,18 @@
 ## Constants
 
 
-<a id="main_C"></a>
+<a id="<SELF>_0_C"></a>
 
 
 
-<pre><code><b>const</b> <a href="attribute_placement.md#main_C">C</a>: u64 = 0;
+<pre><code><b>const</b> <a href="attribute_placement.md#<SELF>_0_C">C</a>: u64 = 0;
 </code></pre>
 
 
 
 
 <pre><code>#[attr14]
-<b>fun</b> <a href="attribute_placement.md#main">main</a>()
+<b>fun</b> <a href="attribute_placement.md#<SELF>_0_main">main</a>()
 </code></pre>
 
 
@@ -213,7 +213,7 @@
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="attribute_placement.md#main">main</a>() {
+<pre><code><b>fun</b> <a href="attribute_placement.md#<SELF>_0_main">main</a>() {
     <a href="attribute_placement.md#0x42_M_foo">M::foo</a>();
 }
 </code></pre>

diff --git a/...ove-prover/move-docgen/tests/sources/attribute_placement.spec_inline_no_fold.md b/...ove-prover/move-docgen/tests/sources/attribute_placement.spec_inline_no_fold.md
@@ -150,9 +150,9 @@
 
 
 
-<a id="main"></a>
+<a id="<SELF>_0"></a>
 
-# Script `main`
+# Script `<SELF>_0`
 
 
 
@@ -174,26 +174,26 @@
 ## Constants
 
 
-<a id="main_C"></a>
+<a id="<SELF>_0_C"></a>
 
 
 
-<pre><code><b>const</b> <a href="attribute_placement.md#main_C">C</a>: u64 = 0;
+<pre><code><b>const</b> <a href="attribute_placement.md#<SELF>_0_C">C</a>: u64 = 0;
 </code></pre>
 
 
 
 
 <pre><code>#[attr14]
-<b>fun</b> <a href="attribute_placement.md#main">main</a>()
+<b>fun</b> <a href="attribute_placement.md#<SELF>_0_main">main</a>()
 </code></pre>
 
 
 
 ##### Implementation
 
 
-<pre><code><b>fun</b> <a href="attribute_placement.md#main">main</a>() {
+<pre><code><b>fun</b> <a href="attribute_placement.md#<SELF>_0_main">main</a>() {
     <a href="attribute_placement.md#0x42_M_foo">M::foo</a>();
 }
 </code></pre>

diff --git a/...move/move-prover/move-docgen/tests/sources/attribute_placement.spec_separate.md b/...move/move-prover/move-docgen/tests/sources/attribute_placement.spec_separate.md
@@ -179,9 +179,9 @@
 
 
 
-<a id="main"></a>
+<a id="<SELF>_0"></a>
 
-# Script `main`
+# Script `<SELF>_0`
 
 
 
@@ -205,18 +205,18 @@
 ## Constants
 
 
-<a id="main_C"></a>
+<a id="<SELF>_0_C"></a>
 
 
 
-<pre><code><b>const</b> <a href="attribute_placement.md#main_C">C</a>: u64 = 0;
+<pre><code><b>const</b> <a href="attribute_placement.md#<SELF>_0_C">C</a>: u64 = 0;
 </code></pre>
 
 
 
 
 <pre><code>#[attr14]
-<b>fun</b> <a href="attribute_placement.md#main">main</a>()
+<b>fun</b> <a href="attribute_placement.md#<SELF>_0_main">main</a>()
 </code></pre>
 
 
@@ -225,7 +225,7 @@
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="attribute_placement.md#main">main</a>() {
+<pre><code><b>fun</b> <a href="attribute_placement.md#<SELF>_0_main">main</a>() {
     <a href="attribute_placement.md#0x42_M_foo">M::foo</a>();
 }
 </code></pre>
@@ -245,5 +245,5 @@
 
 
 <pre><code>#[attr14]
-<b>fun</b> <a href="attribute_placement.md#main">main</a>()
+<b>fun</b> <a href="attribute_placement.md#<SELF>_0_main">main</a>()
 </code></pre>
diff --git a/...party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_inline.md b/...party/move/move-prover/move-docgen/tests/sources/code_block_test.spec_inline.md
@@ -1,7 +1,7 @@
 
-<a id="main"></a>
+<a id="<SELF>_0"></a>
 
-# Script `main`
+# Script `<SELF>_0`
 
 
 
@@ -22,7 +22,7 @@ code block
 then <code>inline code</code>
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>()
+<pre><code><b>fun</b> <a href="code_block_test.md#<SELF>_0_main">main</a>()
 </code></pre>
 
 
@@ -31,7 +31,7 @@ then <code>inline code</code>
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>() { }
+<pre><code><b>fun</b> <a href="code_block_test.md#<SELF>_0_main">main</a>() { }
 </code></pre>
 
 

diff --git a/...ve/move-prover/move-docgen/tests/sources/code_block_test.spec_inline_no_fold.md b/...ve/move-prover/move-docgen/tests/sources/code_block_test.spec_inline_no_fold.md
@@ -1,7 +1,7 @@
 
-<a id="main"></a>
+<a id="<SELF>_0"></a>
 
-# Script `main`
+# Script `<SELF>_0`
 
 
 
@@ -22,13 +22,13 @@ code block
 then <code>inline code</code>
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>()
+<pre><code><b>fun</b> <a href="code_block_test.md#<SELF>_0_main">main</a>()
 </code></pre>
 
 
 
 ##### Implementation
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>() { }
+<pre><code><b>fun</b> <a href="code_block_test.md#<SELF>_0_main">main</a>() { }
 </code></pre>
diff --git a/...rty/move/move-prover/move-docgen/tests/sources/code_block_test.spec_separate.md b/...rty/move/move-prover/move-docgen/tests/sources/code_block_test.spec_separate.md
@@ -1,7 +1,7 @@
 
-<a id="main"></a>
+<a id="<SELF>_0"></a>
 
-# Script `main`
+# Script `<SELF>_0`
 
 
 
@@ -22,7 +22,7 @@ code block
 then <code>inline code</code>
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>()
+<pre><code><b>fun</b> <a href="code_block_test.md#<SELF>_0_main">main</a>()
 </code></pre>
 
 
@@ -31,7 +31,7 @@ then <code>inline code</code>
 <summary>Implementation</summary>
 
 
-<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>() { }
+<pre><code><b>fun</b> <a href="code_block_test.md#<SELF>_0_main">main</a>() { }
 </code></pre>