data: simplify haskell trace schema

Author: will-break-it

data/simulation/trace.haskell.d.ts

@@ -4,6 +4,8 @@ export interface HaskellTraceEvent {
     event: HaskellEvent;
 }
 
+type MessageKind = "IB" | "EB" | "RB" | "VT";
+
 type HaskellEvent =
     | HaskellCpuEvent
     | HaskellGeneratedEvent
@@ -20,22 +22,43 @@ interface HaskellCpuEvent {
     task_label: string; // e.g., "ValIB: 6-29" or "ValRH: 6253064077348247640"
 }
 
-interface HaskellGeneratedEvent {
+type HaskellGeneratedEvent =
+    | HaskellGeneratedIBEvent
+    | HaskellGeneratedEBEvent
+    | HaskellGeneratedRBEvent
+    | HaskellGeneratedVTEvent;
+
+interface HaskellGeneratedBaseEvent {
     tag: "generated";
-    kind: "IB" | "EB" | "RB" | "VT";
-    id: string;
     node: number;
     node_name: string;
     size_bytes: number;
-    // Required for IB
-    slot?: number;
-    payload_bytes?: number;
-    rb_ref?: string;
-    // Required for EB
-    input_blocks?: string[];
-    // Required for VT
-    votes?: number;
-    endorse_blocks?: string[];
+}
+
+interface HaskellGeneratedIBEvent extends HaskellGeneratedBaseEvent {
+    kind: Extract<MessageKind, "IB">;
+    id: string;
+    slot: number;
+    payload_bytes: number;
+    rb_ref: string;
+}
+
+interface HaskellGeneratedEBEvent extends HaskellGeneratedBaseEvent {
+    kind: Extract<MessageKind, "EB">;
+    id: string;
+    input_blocks: string[];
+}
+
+interface HaskellGeneratedRBEvent extends HaskellGeneratedBaseEvent {
+    kind: Extract<MessageKind, "RB">;
+    id: string;
+}
+
+interface HaskellGeneratedVTEvent extends HaskellGeneratedBaseEvent {
+    kind: Extract<MessageKind, "VT">;
+    id: string;
+    votes: number;
+    endorse_blocks: string[];
 }
 
 interface HaskellSentEvent {
@@ -44,21 +67,21 @@ interface HaskellSentEvent {
     receipient: number;
     msg_size_bytes: number;
     sending_s: number;
-    kind: "IB" | "EB" | "RB" | "VT";
+    kind: MessageKind;
     ids: string[];
 }
 
 interface HaskellReceivedEvent {
     tag: "received";
-    kind: "IB" | "EB" | "RB" | "VT";
+    kind: MessageKind;
     id: string;
     node: number;
     node_name: string;
 }
 
 interface HaskellStateEvent {
     tag: "enteredstate";
-    kind: "IB" | "EB" | "RB" | "VT";
+    kind: MessageKind;
     id: string;
     node: number;
     node_name: string;

data/simulation/trace.haskell.schema.json

@@ -17,7 +17,6 @@
           "type": "string"
         },
         "task_label": {
-          "description": "CPU task types:\n- Block validation: ValIB, ValEB, ValRB\n- Header validation: ValIH, ValRH\n- Vote validation: ValVote\nFormat: \"<task_type>: <id>\"",
           "type": "string"
         }
       },
@@ -29,7 +28,16 @@
           "$ref": "#/definitions/HaskellCpuEvent"
         },
         {
-          "$ref": "#/definitions/HaskellGeneratedEvent"
+          "$ref": "#/definitions/HaskellGeneratedIBEvent"
+        },
+        {
+          "$ref": "#/definitions/HaskellGeneratedEBEvent"
+        },
+        {
+          "$ref": "#/definitions/HaskellGeneratedRBEvent"
+        },
+        {
+          "$ref": "#/definitions/HaskellGeneratedVTEvent"
         },
         {
           "$ref": "#/definitions/HaskellSentEvent"
@@ -42,14 +50,8 @@
         }
       ]
     },
-    "HaskellGeneratedEvent": {
+    "HaskellGeneratedEBEvent": {
       "properties": {
-        "endorse_blocks": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
         "id": {
           "type": "string"
         },
@@ -60,7 +62,32 @@
           "type": "array"
         },
         "kind": {
-          "enum": ["EB", "IB", "RB", "VT"],
+          "const": "EB",
+          "type": "string"
+        },
+        "node": {
+          "type": "number"
+        },
+        "node_name": {
+          "type": "string"
+        },
+        "size_bytes": {
+          "type": "number"
+        },
+        "tag": {
+          "const": "generated",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
+    "HaskellGeneratedIBEvent": {
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "kind": {
+          "const": "IB",
           "type": "string"
         },
         "node": {
@@ -81,6 +108,62 @@
         "slot": {
           "type": "number"
         },
+        "tag": {
+          "const": "generated",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
+    "HaskellGeneratedRBEvent": {
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "kind": {
+          "const": "RB",
+          "type": "string"
+        },
+        "node": {
+          "type": "number"
+        },
+        "node_name": {
+          "type": "string"
+        },
+        "size_bytes": {
+          "type": "number"
+        },
+        "tag": {
+          "const": "generated",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
+    "HaskellGeneratedVTEvent": {
+      "properties": {
+        "endorse_blocks": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
+        "id": {
+          "type": "string"
+        },
+        "kind": {
+          "const": "VT",
+          "type": "string"
+        },
+        "node": {
+          "type": "number"
+        },
+        "node_name": {
+          "type": "string"
+        },
+        "size_bytes": {
+          "type": "number"
+        },
         "tag": {
           "const": "generated",
           "type": "string"
@@ -97,8 +180,7 @@
           "type": "string"
         },
         "kind": {
-          "enum": ["EB", "IB", "RB", "VT"],
-          "type": "string"
+          "$ref": "#/definitions/MessageKind"
         },
         "node": {
           "type": "number"
@@ -122,8 +204,7 @@
           "type": "array"
         },
         "kind": {
-          "enum": ["EB", "IB", "RB", "VT"],
-          "type": "string"
+          "$ref": "#/definitions/MessageKind"
         },
         "msg_size_bytes": {
           "type": "number"
@@ -150,8 +231,7 @@
           "type": "string"
         },
         "kind": {
-          "enum": ["EB", "IB", "RB", "VT"],
-          "type": "string"
+          "$ref": "#/definitions/MessageKind"
         },
         "node": {
           "type": "number"
@@ -165,6 +245,10 @@
         }
       },
       "type": "object"
+    },
+    "MessageKind": {
+      "enum": ["EB", "IB", "RB", "VT"],
+      "type": "string"
     }
   },
   "description": "Haskell simulation trace format",