Fix json-from-wast where assert_return contains const values (#2435)

* Fix json-from-wast where assert_return contains const values

* fix format

Author: mpoindexter

crates/json-from-wast/src/lib.rs

@@ -560,7 +560,7 @@ where
 }
 
 #[derive(Serialize, Deserialize, Debug)]
-#[serde(tag = "type", rename_all = "lowercase")]
+#[serde(tag = "type", content = "value", rename_all = "lowercase")]
 pub enum ComponentConst<'a> {
     #[serde(borrow)]
     String(Cow<'a, str>),

tests/cli/component-model/assert_return.wast

@@ -0,0 +1,9 @@
+;; RUN: wast --assert default --snapshot tests/snapshots %
+
+(component
+  (core module $m (func (export "") (result i32) i32.const 1))
+  (core instance $m (instantiate $m))
+  (func (export "a") (result u32) (canon lift (core func $m "")))
+)
+
+(assert_return (invoke "a") (u32.const 1))

tests/snapshots/cli/component-model/assert_return.wast.json

@@ -0,0 +1,26 @@
+{
+  "source_filename": "tests/cli/component-model/assert_return.wast",
+  "commands": [
+    {
+      "type": "module",
+      "line": 3,
+      "filename": "assert_return.0.wasm",
+      "module_type": "binary"
+    },
+    {
+      "type": "assert_return",
+      "line": 9,
+      "action": {
+        "type": "invoke",
+        "field": "a",
+        "args": []
+      },
+      "expected": [
+        {
+          "type": "u32",
+          "value": "1"
+        }
+      ]
+    }
+  ]
+}

tests/snapshots/cli/component-model/assert_return.wast/0.print

@@ -0,0 +1,14 @@
+(component
+  (core module $m (;0;)
+    (type (;0;) (func (result i32)))
+    (export "" (func 0))
+    (func (;0;) (type 0) (result i32)
+      i32.const 1
+    )
+  )
+  (core instance $m (;0;) (instantiate $m))
+  (type (;0;) (func (result u32)))
+  (alias core export $m "" (core func (;0;)))
+  (func (;0;) (type 0) (canon lift (core func 0)))
+  (export (;1;) "a" (func 0))
+)