Merge pull request #109 from davxy/consistent-stf-vectors-format-for-preimages-lookup-request

Consistence between testvectors format in stf/preimages and stf/accumulate

Author: davxy

stf/accumulate/accumulate.asn

@@ -4,7 +4,7 @@ AccumulateModule DEFINITIONS ::= BEGIN
 
 IMPORTS
     TimeSlot, ServiceId, ServiceInfo, WorkReport, OpaqueHash, ByteSequence,
-    Entropy, ReadyQueue, AccumulatedQueue, Privileges, ServicesStatistics
+    Entropy, ReadyQueue, AccumulatedQueue, Privileges, ServicesStatistics, U32
         FROM JamTypes;
 
 StorageMapEntry ::= SEQUENCE {
@@ -14,35 +14,42 @@ StorageMapEntry ::= SEQUENCE {
     value ByteSequence
 }
 
-PreimagesMapEntry ::= SEQUENCE {
+PreimagesBlobMapEntry ::= SEQUENCE {
     -- Preimage blob full hash
     hash OpaqueHash,
     -- Preimage blob
     blob ByteSequence
 }
 
-PreimagesStatusMapEntry ::= SEQUENCE {
-    -- Preimage blob full hash
+PreimagesRequestsMapKey ::= SEQUENCE {
+    -- Preimage blob hash
     hash OpaqueHash,
+    -- Preimage blob length
+    length U32
+}
+
+PreimagesRequestsMapEntry ::= SEQUENCE {
+    -- Preimage request key
+    key PreimagesRequestsMapKey,
     -- Preimage request status
-    status SEQUENCE (SIZE(0..3)) OF TimeSlot
+    value SEQUENCE (SIZE(0..3)) OF TimeSlot
 }
 
 -- Service account information relevant for this STF.
-Account ::= SEQUENCE {
+ServiceAccount ::= SEQUENCE {
     -- [a_c, a_b, a_g, a_m, a_o, a_i] Service metadata.
     service ServiceInfo,
     -- [a_s] Service storage.
     storage SEQUENCE OF StorageMapEntry,
     -- [a_p] Preimages blobs.
-    preimages-blob SEQUENCE OF PreimagesMapEntry,
-    -- [a_l] Preimages status.
-    preimages-status SEQUENCE OF PreimagesStatusMapEntry
+    preimage-blobs SEQUENCE OF PreimagesBlobMapEntry,
+    -- [a_l] Preimages requests.
+    preimage-requests SEQUENCE OF PreimagesRequestsMapEntry
 }
 
 AccountsMapEntry ::= SEQUENCE {
     id ServiceId,
-    data Account
+    data ServiceAccount
 }
 
 State ::= SEQUENCE {

stf/accumulate/accumulate.py

@@ -12,7 +12,9 @@
     ServiceInfo,
     ByteSequence,
     Privileges,
-    ServicesStatistics
+    ServicesStatistics,
+    Vec,
+    U32
 )
 from jam_types import class_name as n
 
@@ -22,32 +24,41 @@ class AccumulateStorageMapEntry(Struct):
         ('value', n(ByteSequence)),
     ]
 
-class AccumulatePreimagesMapEntry(Struct):
+class AccumulatePreimagesBlobMapEntry(Struct):
     type_mapping = [
         ('hash', n(OpaqueHash)),
         ('blob', n(ByteSequence)),
     ]
 
-class AccumulatePreimagesStatusMapEntry(Struct):
+class AccumulatePreimagesRequestsMapKey(Struct):
     type_mapping = [
         ('hash', n(OpaqueHash)),
-        ('status', 'Vec<TimeSlot>')
+        ('length', n(U32)),
     ]
 
-class AccumulateAccountMapData(Struct):
+class AccumulatePreimagesRequestsMapEntry(Struct):
+    type_mapping = [
+        ('key', n(AccumulatePreimagesRequestsMapKey)),
+        ('value', 'Vec<TimeSlot>')
+    ]
+
+class AccumulateServiceAccount(Struct):
     type_mapping = [
         ('service', n(ServiceInfo)),
         ('storage', 'Vec<AccumulateStorageMapEntry>'),
-        ('preimages_blob', 'Vec<AccumulatePreimagesMapEntry>'),
-        ('preimages_status', 'Vec<AccumulatePreimagesStatusMapEntry>')
+        ('preimage_blobs', 'Vec<AccumulatePreimagesBlobMapEntry>'),
+        ('preimage_requests', 'Vec<AccumulatePreimagesRequestsMapEntry>')
     ]
 
-class AccumulateAccountMapEntry(Struct):
+class AccumulateServiceAccountMapEntry(Struct):
     type_mapping = [
         ('id', n(ServiceId)),
-        ('data', n(AccumulateAccountMapData))
+        ('data', n(AccumulateServiceAccount))
     ]    
 
+class AccumulateServiceAccountMap(Vec):
+    sub_type = n(AccumulateServiceAccountMapEntry)
+
 class AccumulateState(Struct):
     type_mapping = [
         ('slot', n(TimeSlot)),
@@ -56,7 +67,7 @@ class AccumulateState(Struct):
         ('accumulated', n(AccumulatedQueue)),
         ('privileges', n(Privileges)),
         ('statistics', n(ServicesStatistics)),
-        ('accounts', 'Vec<AccumulateAccountMapEntry>'),
+        ('accounts', n(AccumulateServiceAccountMap))
     ]  
 
 class AccumulateInput(Struct):