Revert "[json-rpc] Update variants to be returned in declaration orde…

…r" (#21413) (#21414) Reverts #21359 The change in the format is causing breaking issues for clients. Revert back to previous layout for now.
MystenLabs · Mar 4, 2025 · 556b6e1 · 556b6e1
1 parent e019769
commit 556b6e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/crates/sui-json-rpc-types/src/sui_move.rs b/crates/sui-json-rpc-types/src/sui_move.rs
@@ -77,8 +77,7 @@ pub struct SuiMoveNormalizedStruct {
 pub struct SuiMoveNormalizedEnum {
     pub abilities: SuiMoveAbilitySet,
     pub type_parameters: Vec<SuiMoveStructTypeParameter>,
-    // NB: Don't use a `BTreeMap` here as we want to keep the declaration order of the variants
-    pub variants: Vec<(String, Vec<SuiMoveNormalizedField>)>,
+    pub variants: BTreeMap<String, Vec<SuiMoveNormalizedField>>,
 }
 
 #[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
@@ -247,7 +246,7 @@ impl From<NormalizedEnum> for SuiMoveNormalizedEnum {
                             .collect::<Vec<SuiMoveNormalizedField>>(),
                     )
                 })
-                .collect::<Vec<(String, Vec<SuiMoveNormalizedField>)>>(),
+                .collect::<BTreeMap<String, Vec<SuiMoveNormalizedField>>>(),
         }
     }
 }

diff --git a/crates/sui-open-rpc/spec/openrpc.json b/crates/sui-open-rpc/spec/openrpc.json
@@ -9009,22 +9009,12 @@
             }
           },
           "variants": {
-            "type": "array",
-            "items": {
+            "type": "object",
+            "additionalProperties": {
               "type": "array",
-              "items": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/SuiMoveNormalizedField"
-                  }
-                }
-              ],
-              "maxItems": 2,
-              "minItems": 2
+              "items": {
+                "$ref": "#/components/schemas/SuiMoveNormalizedField"
+              }
             }
           }
         }