Skip to content

Commit bbb47d3

Browse files
committed
trace schema: moved ValTX to shared.CpuTaskType
now rust trace validates against trace.shared.d.ts. haskell trace needs a few fixes.
1 parent 234bd47 commit bbb47d3

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

data/simulation/trace.rust.d.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,7 @@ interface CpuTaskFinishedEvent {
3939
cpu_time_s: number;
4040
}
4141

42-
type CpuTaskType =
43-
| shared.CpuTaskType
44-
| "GenIB"
45-
| "GenEB"
46-
| "GenRB"
47-
| "GenVote"
48-
| "ValTX";
42+
type CpuTaskType = shared.CpuTaskType;
4943

5044
type BlockEvent = shared.BlockEvent | LotteryWon | GeneratedTransaction;
5145

data/simulation/trace.shared.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ interface NoBlockEvent {
3636
slot: number;
3737
}
3838

39-
type CpuTaskType = "ValIB" | "ValEB" | "ValRB" | "ValIH" | "ValRH" | "ValVote" | "GenIB" | "GenEB" | "GenVote" | "GenRB"
39+
type CpuTaskType = "ValIB" | "ValEB" | "ValRB" | "ValIH" | "ValRH" | "ValVote" | "GenIB" | "GenEB" | "GenVote" | "GenRB" | "ValTX";
4040
type CpuEventType = "Cpu"
4141
interface CpuEvent {
4242
type: CpuEventType;

data/simulation/trace.shared.schema.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,18 @@
4242
"type": "object"
4343
},
4444
"CpuTaskType": {
45-
"enum": ["ValEB", "ValIB", "ValIH", "ValRB", "ValRH", "ValVote"],
45+
"enum": [
46+
"GenEB",
47+
"GenIB",
48+
"GenRB",
49+
"GenVote",
50+
"ValEB",
51+
"ValIB",
52+
"ValIH",
53+
"ValRB",
54+
"ValRH",
55+
"ValVote"
56+
],
4657
"type": "string"
4758
},
4859
"Endorsement": {

0 commit comments

Comments
 (0)