Skip to content

Commit 18036ce

Browse files
davxydavxy
committed
Align ASN.1
1 parent 8de052e commit 18036ce

File tree

63 files changed

+179
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+179
-172
lines changed

‎stf/accumulate/accumulate.asn‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ AccumulateModule DEFINITIONS ::= BEGIN
44

55
IMPORTS
66
TimeSlot, ServiceId, ServiceInfo, WorkReport, OpaqueHash, ByteSequence,
7-
Entropy, ReadyQueue, AccumulatedQueue, Privileges, ServicesStatistics
7+
Entropy, ReadyQueue, AccumulatedQueue, Privileges, ServicesStatistics, U32
88
FROM JamTypes;
99

1010
StorageMapEntry ::= SEQUENCE {
@@ -14,35 +14,42 @@ StorageMapEntry ::= SEQUENCE {
1414
value ByteSequence
1515
}
1616

17-
PreimagesMapEntry ::= SEQUENCE {
17+
PreimagesBlobMapEntry ::= SEQUENCE {
1818
-- Preimage blob full hash
1919
hash OpaqueHash,
2020
-- Preimage blob
2121
blob ByteSequence
2222
}
2323

24-
PreimagesStatusMapEntry ::= SEQUENCE {
25-
-- Preimage blob full hash
24+
PreimagesRequestsMapKey ::= SEQUENCE {
25+
-- Preimage blob hash
2626
hash OpaqueHash,
27+
-- Preimage blob length
28+
length U32
29+
}
30+
31+
PreimagesRequestsMapEntry ::= SEQUENCE {
32+
-- Preimage request key
33+
key PreimagesRequestsMapKey,
2734
-- Preimage request status
28-
status SEQUENCE (SIZE(0..3)) OF TimeSlot
35+
value SEQUENCE (SIZE(0..3)) OF TimeSlot
2936
}
3037

3138
-- Service account information relevant for this STF.
32-
Account ::= SEQUENCE {
39+
ServiceAccount ::= SEQUENCE {
3340
-- [a_c, a_b, a_g, a_m, a_o, a_i] Service metadata.
3441
service ServiceInfo,
3542
-- [a_s] Service storage.
3643
storage SEQUENCE OF StorageMapEntry,
3744
-- [a_p] Preimages blobs.
38-
preimages-blob SEQUENCE OF PreimagesMapEntry,
39-
-- [a_l] Preimages status.
40-
preimages-status SEQUENCE OF PreimagesStatusMapEntry
45+
preimage-blobs SEQUENCE OF PreimagesBlobMapEntry,
46+
-- [a_l] Preimages requests.
47+
preimage-requests SEQUENCE OF PreimagesRequestsMapEntry
4148
}
4249

4350
AccountsMapEntry ::= SEQUENCE {
4451
id ServiceId,
45-
data Account
52+
data ServiceAccount
4653
}
4754

4855
State ::= SEQUENCE {

‎stf/accumulate/accumulate.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AccumulatePreimagesRequestsMapKey(Struct):
3939
class AccumulatePreimagesRequestsMapEntry(Struct):
4040
type_mapping = [
4141
('key', n(AccumulatePreimagesRequestsMapKey)),
42-
('status', 'Vec<TimeSlot>')
42+
('value', 'Vec<TimeSlot>')
4343
]
4444

4545
class AccumulateServiceAccount(Struct):

‎stf/accumulate/full/accumulate_ready_queued_reports-1.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2022,7 +2022,7 @@
20222022
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
20232023
"length": 35728
20242024
},
2025-
"status": [
2025+
"value": [
20262026
0
20272027
]
20282028
}
@@ -3654,7 +3654,7 @@
36543654
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
36553655
"length": 35728
36563656
},
3657-
"status": [
3657+
"value": [
36583658
0
36593659
]
36603660
}

‎stf/accumulate/full/enqueue_and_unlock_chain-1.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,7 +1676,7 @@
16761676
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
16771677
"length": 35728
16781678
},
1679-
"status": [
1679+
"value": [
16801680
0
16811681
]
16821682
}
@@ -3372,7 +3372,7 @@
33723372
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
33733373
"length": 35728
33743374
},
3375-
"status": [
3375+
"value": [
33763376
0
33773377
]
33783378
}

‎stf/accumulate/full/enqueue_and_unlock_chain-2.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1772,7 +1772,7 @@
17721772
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
17731773
"length": 35728
17741774
},
1775-
"status": [
1775+
"value": [
17761776
0
17771777
]
17781778
}
@@ -3563,7 +3563,7 @@
35633563
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
35643564
"length": 35728
35653565
},
3566-
"status": [
3566+
"value": [
35673567
0
35683568
]
35693569
}

‎stf/accumulate/full/enqueue_and_unlock_chain-3.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1865,7 +1865,7 @@
18651865
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
18661866
"length": 35728
18671867
},
1868-
"status": [
1868+
"value": [
18691869
0
18701870
]
18711871
}
@@ -3681,7 +3681,7 @@
36813681
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
36823682
"length": 35728
36833683
},
3684-
"status": [
3684+
"value": [
36853685
0
36863686
]
36873687
}

‎stf/accumulate/full/enqueue_and_unlock_chain-4.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1848,7 +1848,7 @@
18481848
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
18491849
"length": 35728
18501850
},
1851-
"status": [
1851+
"value": [
18521852
0
18531853
]
18541854
}
@@ -3477,7 +3477,7 @@
34773477
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
34783478
"length": 35728
34793479
},
3480-
"status": [
3480+
"value": [
34813481
0
34823482
]
34833483
}

‎stf/accumulate/full/enqueue_and_unlock_chain_wraps-1.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1846,7 +1846,7 @@
18461846
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
18471847
"length": 35728
18481848
},
1849-
"status": [
1849+
"value": [
18501850
0
18511851
]
18521852
}
@@ -3695,7 +3695,7 @@
36953695
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
36963696
"length": 35728
36973697
},
3698-
"status": [
3698+
"value": [
36993699
0
37003700
]
37013701
}

‎stf/accumulate/full/enqueue_and_unlock_chain_wraps-2.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1923,7 +1923,7 @@
19231923
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
19241924
"length": 35728
19251925
},
1926-
"status": [
1926+
"value": [
19271927
0
19281928
]
19291929
}
@@ -3838,7 +3838,7 @@
38383838
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
38393839
"length": 35728
38403840
},
3841-
"status": [
3841+
"value": [
38423842
0
38433843
]
38443844
}

‎stf/accumulate/full/enqueue_and_unlock_chain_wraps-3.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1991,7 +1991,7 @@
19911991
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
19921992
"length": 35728
19931993
},
1994-
"status": [
1994+
"value": [
19951995
0
19961996
]
19971997
}
@@ -3985,7 +3985,7 @@
39853985
"hash": "0x65e537f16b30c01e1325535ab9a18c35c9382bb4dce37c6c3e37c9b76a85c2b7",
39863986
"length": 35728
39873987
},
3988-
"status": [
3988+
"value": [
39893989
0
39903990
]
39913991
}

0 commit comments

Comments
 (0)