Fix ASN.1 for stats

Author: davxy

jam-types-asn/jam-types.asn

@@ -254,7 +254,7 @@ BlocksHistory ::= SEQUENCE (SIZE(0..max-blocks-history)) OF BlockInfo
 -- Statistics
 --------------------------------------------
 
-ActivityRecord ::= SEQUENCE {
+ValidatorActivityRecord ::= SEQUENCE {
     blocks      U32,
     tickets     U32,
     pre-images  U32,
@@ -263,7 +263,7 @@ ActivityRecord ::= SEQUENCE {
     assurances  U32
 }
 
-ActivityRecords ::= SEQUENCE (SIZE(validators-count)) OF ActivityRecord
+ValidatorsStatistics ::= SEQUENCE (SIZE(validators-count)) OF ValidatorActivityRecord
 
 CoreActivityRecord ::= SEQUENCE {
 	-- Amount of bytes which are placed into either Audits or Segments DA.
@@ -323,8 +323,8 @@ ServicesStatisticsMapEntry ::= SEQUENCE {
 ServicesStatistics ::= SEQUENCE OF ServicesStatisticsMapEntry
 
 Statistics ::= SEQUENCE {
-    vals-current ActivityRecords,
-    vals-last    ActivityRecords,
+    vals-curr    ValidatorsStatistics,
+    vals-last    ValidatorsStatistics,
     cores        CoresStatistics,
     services     ServicesStatistics
 }

preimages/README.md

@@ -5,9 +5,12 @@ and this subsystem STF specific [schema](./preimages.asn).
 
 ## Statistics
 
-A subset of `ServiceActivityRecord` structure is updated by the STF involved processing these test vectors.
-In particular the `provided-count` and `provided-size` items are updated when new preimages are provided
-to be included in the chain storage via the extrinsic.
+A subset of `ServiceActivityRecord` structure is updated by the STF involved
+processing these test vectors.
+
+In particular the `provided-count` and `provided-size` items are updated
+when new preimages are provided to be included in the chain storage via the
+extrinsic.
 
 ## Vectors
 

statistics/statistics.asn

@@ -3,13 +3,15 @@
 StatisticsModule DEFINITIONS ::= BEGIN
 
 IMPORTS
-    TimeSlot, ValidatorIndex, Statistics, Extrinsic, ValidatorsData
+    TimeSlot, ValidatorIndex, ValidatorsStatistics, Extrinsic, ValidatorsData
         FROM JamTypes;
 
 
 State ::= SEQUENCE {
-    -- [π] Prior statistics. Mutated to π'.
-    statistics Statistics,
+    -- [π_V] Current validators statistics. Mutated to π_V'.
+    vals-curr-stats ValidatorsStatistics,
+    -- [π_L] Last validators statistics. Mutated to π_L'.
+    vals-last-stats ValidatorsStatistics,
     -- [τ] Prior timeslot.
     slot TimeSlot,
     -- [κ'] Posterior active validators.