Skip to content

Commit d6e2663

Browse files
authored
Merge pull request #94 from davxy/fix-stats-order
Fix CoreActivityRecord and ServiceActivityRecord items order
2 parents 5765d94 + f8690e2 commit d6e2663

File tree

843 files changed

+109888
-94841
lines changed

Some content is hidden

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

843 files changed

+109888
-94841
lines changed

lib/jam-types.asn

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -475,12 +475,12 @@ CoreActivityRecord ::= SEQUENCE {
475475
popularity U16,
476476
-- Number of segments imported from DA for block processing
477477
imports U16,
478-
-- Number of segments exported to DA during block processing
479-
exports U16,
480-
-- Total size of extrinsics for reported work.
481-
extrinsic-size U32,
482478
-- Total number of extrinsics for reported work.
483479
extrinsic-count U16,
480+
-- Total size of extrinsics for reported work.
481+
extrinsic-size U32,
482+
-- Number of segments exported to DA during block processing
483+
exports U16,
484484
-- Serialized work bundle size written to DA.
485485
bundle-size U32,
486486
-- Total gas consumed during block processing (includes refinements and authorizations).
@@ -502,12 +502,12 @@ ServiceActivityRecord ::= SEQUENCE {
502502
refinement-gas-used Gas,
503503
-- Number of segments imported from the DL
504504
imports U32,
505-
-- Number of segments exported into the DL
506-
exports U32,
507-
-- Total size of extrinsics used
508-
extrinsic-size U32,
509505
-- Total number of extrinsics used
510506
extrinsic-count U32,
507+
-- Total size of extrinsics used
508+
extrinsic-size U32,
509+
-- Number of segments exported into the DL
510+
exports U32,
511511
-- Number of work-items accumulated
512512
accumulate-count U32,
513513
-- Amount of gas used for accumulation

stf/accumulate/full/accumulate_ready_queued_reports-1.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3597,9 +3597,9 @@
35973597
"refinement_count": 0,
35983598
"refinement_gas_used": 0,
35993599
"imports": 0,
3600-
"exports": 0,
3601-
"extrinsic_size": 0,
36023600
"extrinsic_count": 0,
3601+
"extrinsic_size": 0,
3602+
"exports": 0,
36033603
"accumulate_count": 9,
36043604
"accumulate_gas_used": 14992,
36053605
"on_transfers_count": 0,

stf/accumulate/full/enqueue_and_unlock_chain-3.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3624,9 +3624,9 @@
36243624
"refinement_count": 0,
36253625
"refinement_gas_used": 0,
36263626
"imports": 0,
3627-
"exports": 0,
3628-
"extrinsic_size": 0,
36293627
"extrinsic_count": 0,
3628+
"extrinsic_size": 0,
3629+
"exports": 0,
36303630
"accumulate_count": 2,
36313631
"accumulate_gas_used": 5617,
36323632
"on_transfers_count": 0,

stf/accumulate/full/enqueue_and_unlock_chain-4.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1804,9 +1804,9 @@
18041804
"refinement_count": 0,
18051805
"refinement_gas_used": 0,
18061806
"imports": 0,
1807-
"exports": 0,
1808-
"extrinsic_size": 0,
18091807
"extrinsic_count": 0,
1808+
"extrinsic_size": 0,
1809+
"exports": 0,
18101810
"accumulate_count": 2,
18111811
"accumulate_gas_used": 5617,
18121812
"on_transfers_count": 0,
@@ -3422,9 +3422,9 @@
34223422
"refinement_count": 0,
34233423
"refinement_gas_used": 0,
34243424
"imports": 0,
3425-
"exports": 0,
3426-
"extrinsic_size": 0,
34273425
"extrinsic_count": 0,
3426+
"extrinsic_size": 0,
3427+
"exports": 0,
34283428
"accumulate_count": 5,
34293429
"accumulate_gas_used": 9659,
34303430
"on_transfers_count": 0,

stf/accumulate/full/enqueue_and_unlock_chain_wraps-1.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,9 +1802,9 @@
18021802
"refinement_count": 0,
18031803
"refinement_gas_used": 0,
18041804
"imports": 0,
1805-
"exports": 0,
1806-
"extrinsic_size": 0,
18071805
"extrinsic_count": 0,
1806+
"extrinsic_size": 0,
1807+
"exports": 0,
18081808
"accumulate_count": 1,
18091809
"accumulate_gas_used": 4314,
18101810
"on_transfers_count": 0,

stf/accumulate/full/enqueue_and_unlock_chain_wraps-2.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3781,9 +3781,9 @@
37813781
"refinement_count": 0,
37823782
"refinement_gas_used": 0,
37833783
"imports": 0,
3784-
"exports": 0,
3785-
"extrinsic_size": 0,
37863784
"extrinsic_count": 0,
3785+
"extrinsic_size": 0,
3786+
"exports": 0,
37873787
"accumulate_count": 1,
37883788
"accumulate_gas_used": 4304,
37893789
"on_transfers_count": 0,

stf/accumulate/full/enqueue_and_unlock_chain_wraps-3.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,9 +1947,9 @@
19471947
"refinement_count": 0,
19481948
"refinement_gas_used": 0,
19491949
"imports": 0,
1950-
"exports": 0,
1951-
"extrinsic_size": 0,
19521950
"extrinsic_count": 0,
1951+
"extrinsic_size": 0,
1952+
"exports": 0,
19531953
"accumulate_count": 1,
19541954
"accumulate_gas_used": 4304,
19551955
"on_transfers_count": 0,

stf/accumulate/full/enqueue_and_unlock_chain_wraps-4.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3927,9 +3927,9 @@
39273927
"refinement_count": 0,
39283928
"refinement_gas_used": 0,
39293929
"imports": 0,
3930-
"exports": 0,
3931-
"extrinsic_size": 0,
39323930
"extrinsic_count": 0,
3931+
"extrinsic_size": 0,
3932+
"exports": 0,
39333933
"accumulate_count": 1,
39343934
"accumulate_gas_used": 4359,
39353935
"on_transfers_count": 0,

stf/accumulate/full/enqueue_and_unlock_chain_wraps-5.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1946,9 +1946,9 @@
19461946
"refinement_count": 0,
19471947
"refinement_gas_used": 0,
19481948
"imports": 0,
1949-
"exports": 0,
1950-
"extrinsic_size": 0,
19511949
"extrinsic_count": 0,
1950+
"extrinsic_size": 0,
1951+
"exports": 0,
19521952
"accumulate_count": 1,
19531953
"accumulate_gas_used": 4359,
19541954
"on_transfers_count": 0,
@@ -3574,9 +3574,9 @@
35743574
"refinement_count": 0,
35753575
"refinement_gas_used": 0,
35763576
"imports": 0,
3577-
"exports": 0,
3578-
"extrinsic_size": 0,
35793577
"extrinsic_count": 0,
3578+
"extrinsic_size": 0,
3579+
"exports": 0,
35803580
"accumulate_count": 8,
35813581
"accumulate_gas_used": 13707,
35823582
"on_transfers_count": 0,

stf/accumulate/full/enqueue_and_unlock_simple-2.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3245,9 +3245,9 @@
32453245
"refinement_count": 0,
32463246
"refinement_gas_used": 0,
32473247
"imports": 0,
3248-
"exports": 0,
3249-
"extrinsic_size": 0,
32503248
"extrinsic_count": 0,
3249+
"extrinsic_size": 0,
3250+
"exports": 0,
32513251
"accumulate_count": 2,
32523252
"accumulate_gas_used": 5658,
32533253
"on_transfers_count": 0,

0 commit comments

Comments
 (0)