@@ -123,10 +123,10 @@ pub struct BeaconProcessorQueueLengths {
123123 gossip_data_column_queue : usize ,
124124 delayed_block_queue : usize ,
125125 status_queue : usize ,
126- bbrange_queue : usize ,
127- bbroots_queue : usize ,
128- blbroots_queue : usize ,
129- blbrange_queue : usize ,
126+ block_brange_queue : usize ,
127+ block_broots_queue : usize ,
128+ blob_broots_queue : usize ,
129+ blob_brange_queue : usize ,
130130 dcbroots_queue : usize ,
131131 dcbrange_queue : usize ,
132132 gossip_bls_to_execution_change_queue : usize ,
@@ -189,10 +189,10 @@ impl BeaconProcessorQueueLengths {
189189 gossip_data_column_queue : 1024 ,
190190 delayed_block_queue : 1024 ,
191191 status_queue : 1024 ,
192- bbrange_queue : 1024 ,
193- bbroots_queue : 1024 ,
194- blbroots_queue : 1024 ,
195- blbrange_queue : 1024 ,
192+ block_brange_queue : 1024 ,
193+ block_broots_queue : 1024 ,
194+ blob_broots_queue : 1024 ,
195+ blob_brange_queue : 1024 ,
196196 dcbroots_queue : 1024 ,
197197 dcbrange_queue : 1024 ,
198198 gossip_bls_to_execution_change_queue : 16384 ,
@@ -876,10 +876,10 @@ impl<E: EthSpec> BeaconProcessor<E> {
876876 let mut delayed_block_queue = FifoQueue :: new ( queue_lengths. delayed_block_queue ) ;
877877
878878 let mut status_queue = FifoQueue :: new ( queue_lengths. status_queue ) ;
879- let mut bbrange_queue = FifoQueue :: new ( queue_lengths. bbrange_queue ) ;
880- let mut bbroots_queue = FifoQueue :: new ( queue_lengths. bbroots_queue ) ;
881- let mut blbroots_queue = FifoQueue :: new ( queue_lengths. blbroots_queue ) ;
882- let mut blbrange_queue = FifoQueue :: new ( queue_lengths. blbrange_queue ) ;
879+ let mut block_brange_queue = FifoQueue :: new ( queue_lengths. block_brange_queue ) ;
880+ let mut block_broots_queue = FifoQueue :: new ( queue_lengths. block_broots_queue ) ;
881+ let mut blob_broots_queue = FifoQueue :: new ( queue_lengths. blob_broots_queue ) ;
882+ let mut blob_brange_queue = FifoQueue :: new ( queue_lengths. blob_brange_queue ) ;
883883 let mut dcbroots_queue = FifoQueue :: new ( queue_lengths. dcbroots_queue ) ;
884884 let mut dcbrange_queue = FifoQueue :: new ( queue_lengths. dcbrange_queue ) ;
885885
@@ -1190,13 +1190,13 @@ impl<E: EthSpec> BeaconProcessor<E> {
11901190 // and BlocksByRoot)
11911191 } else if let Some ( item) = status_queue. pop ( ) {
11921192 Some ( item)
1193- } else if let Some ( item) = bbrange_queue . pop ( ) {
1193+ } else if let Some ( item) = block_brange_queue . pop ( ) {
11941194 Some ( item)
1195- } else if let Some ( item) = bbroots_queue . pop ( ) {
1195+ } else if let Some ( item) = block_broots_queue . pop ( ) {
11961196 Some ( item)
1197- } else if let Some ( item) = blbrange_queue . pop ( ) {
1197+ } else if let Some ( item) = blob_brange_queue . pop ( ) {
11981198 Some ( item)
1199- } else if let Some ( item) = blbroots_queue . pop ( ) {
1199+ } else if let Some ( item) = blob_broots_queue . pop ( ) {
12001200 Some ( item)
12011201 } else if let Some ( item) = dcbroots_queue. pop ( ) {
12021202 Some ( item)
@@ -1360,9 +1360,15 @@ impl<E: EthSpec> BeaconProcessor<E> {
13601360 backfill_chain_segment. push ( work, work_id)
13611361 }
13621362 Work :: Status { .. } => status_queue. push ( work, work_id) ,
1363- Work :: BlocksByRangeRequest { .. } => bbrange_queue. push ( work, work_id) ,
1364- Work :: BlocksByRootsRequest { .. } => bbroots_queue. push ( work, work_id) ,
1365- Work :: BlobsByRangeRequest { .. } => blbrange_queue. push ( work, work_id) ,
1363+ Work :: BlocksByRangeRequest { .. } => {
1364+ block_brange_queue. push ( work, work_id)
1365+ }
1366+ Work :: BlocksByRootsRequest { .. } => {
1367+ block_broots_queue. push ( work, work_id)
1368+ }
1369+ Work :: BlobsByRangeRequest { .. } => {
1370+ blob_brange_queue. push ( work, work_id)
1371+ }
13661372 Work :: LightClientBootstrapRequest { .. } => {
13671373 lc_bootstrap_queue. push ( work, work_id)
13681374 }
@@ -1384,7 +1390,9 @@ impl<E: EthSpec> BeaconProcessor<E> {
13841390 Work :: GossipBlsToExecutionChange { .. } => {
13851391 gossip_bls_to_execution_change_queue. push ( work, work_id)
13861392 }
1387- Work :: BlobsByRootsRequest { .. } => blbroots_queue. push ( work, work_id) ,
1393+ Work :: BlobsByRootsRequest { .. } => {
1394+ blob_broots_queue. push ( work, work_id)
1395+ }
13881396 Work :: DataColumnsByRootsRequest { .. } => {
13891397 dcbroots_queue. push ( work, work_id)
13901398 }
@@ -1435,10 +1443,10 @@ impl<E: EthSpec> BeaconProcessor<E> {
14351443 WorkType :: ChainSegment => chain_segment_queue. len ( ) ,
14361444 WorkType :: ChainSegmentBackfill => backfill_chain_segment. len ( ) ,
14371445 WorkType :: Status => status_queue. len ( ) ,
1438- WorkType :: BlocksByRangeRequest => blbrange_queue . len ( ) ,
1439- WorkType :: BlocksByRootsRequest => blbroots_queue . len ( ) ,
1440- WorkType :: BlobsByRangeRequest => bbrange_queue . len ( ) ,
1441- WorkType :: BlobsByRootsRequest => bbroots_queue . len ( ) ,
1446+ WorkType :: BlocksByRangeRequest => block_brange_queue . len ( ) ,
1447+ WorkType :: BlocksByRootsRequest => block_broots_queue . len ( ) ,
1448+ WorkType :: BlobsByRangeRequest => blob_brange_queue . len ( ) ,
1449+ WorkType :: BlobsByRootsRequest => blob_broots_queue . len ( ) ,
14421450 WorkType :: DataColumnsByRootsRequest => dcbroots_queue. len ( ) ,
14431451 WorkType :: DataColumnsByRangeRequest => dcbrange_queue. len ( ) ,
14441452 WorkType :: GossipBlsToExecutionChange => {
0 commit comments