mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-31 13:17:09 +00:00
Register processor queue length as histogram (#6012)
* Register processor queue length as histogram * Merge branch 'unstable' of https://github.com/sigp/lighthouse into processor-queue-histogram
This commit is contained in:
@@ -1032,17 +1032,17 @@ impl TestRig {
|
||||
match response_type {
|
||||
ResponseType::Block => self
|
||||
.pop_received_processor_event(|ev| {
|
||||
(ev.work_type() == beacon_processor::RPC_BLOCK).then_some(())
|
||||
(ev.work_type() == beacon_processor::WorkType::RpcBlock).then_some(())
|
||||
})
|
||||
.unwrap_or_else(|e| panic!("Expected block work event: {e}")),
|
||||
ResponseType::Blob => self
|
||||
.pop_received_processor_event(|ev| {
|
||||
(ev.work_type() == beacon_processor::RPC_BLOBS).then_some(())
|
||||
(ev.work_type() == beacon_processor::WorkType::RpcBlobs).then_some(())
|
||||
})
|
||||
.unwrap_or_else(|e| panic!("Expected blobs work event: {e}")),
|
||||
ResponseType::CustodyColumn => self
|
||||
.pop_received_processor_event(|ev| {
|
||||
(ev.work_type() == beacon_processor::RPC_CUSTODY_COLUMN).then_some(())
|
||||
(ev.work_type() == beacon_processor::WorkType::RpcCustodyColumn).then_some(())
|
||||
})
|
||||
.unwrap_or_else(|e| panic!("Expected column work event: {e}")),
|
||||
}
|
||||
@@ -1050,7 +1050,7 @@ impl TestRig {
|
||||
|
||||
fn expect_rpc_custody_column_work_event(&mut self) {
|
||||
self.pop_received_processor_event(|ev| {
|
||||
if ev.work_type() == beacon_processor::RPC_CUSTODY_COLUMN {
|
||||
if ev.work_type() == beacon_processor::WorkType::RpcCustodyColumn {
|
||||
Some(())
|
||||
} else {
|
||||
None
|
||||
@@ -1061,7 +1061,7 @@ impl TestRig {
|
||||
|
||||
fn expect_rpc_sample_verify_work_event(&mut self) {
|
||||
self.pop_received_processor_event(|ev| {
|
||||
if ev.work_type() == beacon_processor::RPC_VERIFY_DATA_COLUMNS {
|
||||
if ev.work_type() == beacon_processor::WorkType::RpcVerifyDataColumn {
|
||||
Some(())
|
||||
} else {
|
||||
None
|
||||
@@ -1072,7 +1072,7 @@ impl TestRig {
|
||||
|
||||
fn expect_sampling_result_work(&mut self) {
|
||||
self.pop_received_processor_event(|ev| {
|
||||
if ev.work_type() == beacon_processor::SAMPLING_RESULT {
|
||||
if ev.work_type() == beacon_processor::WorkType::SamplingResult {
|
||||
Some(())
|
||||
} else {
|
||||
None
|
||||
@@ -1103,7 +1103,7 @@ impl TestRig {
|
||||
match self.beacon_processor_rx.try_recv() {
|
||||
Ok(work) => {
|
||||
// Parent chain sends blocks one by one
|
||||
assert_eq!(work.work_type(), beacon_processor::RPC_BLOCK);
|
||||
assert_eq!(work.work_type(), beacon_processor::WorkType::RpcBlock);
|
||||
}
|
||||
other => panic!(
|
||||
"Expected rpc_block from chain segment process, found {:?}",
|
||||
|
||||
@@ -652,7 +652,10 @@ mod tests {
|
||||
fn expect_empty_processor(&mut self) {
|
||||
match self.beacon_processor_rx.try_recv() {
|
||||
Ok(work) => {
|
||||
panic!("Expected empty processor. Instead got {}", work.work_type());
|
||||
panic!(
|
||||
"Expected empty processor. Instead got {}",
|
||||
work.work_type_str()
|
||||
);
|
||||
}
|
||||
Err(e) => match e {
|
||||
mpsc::error::TryRecvError::Empty => {}
|
||||
@@ -665,7 +668,7 @@ mod tests {
|
||||
fn expect_chain_segment(&mut self) {
|
||||
match self.beacon_processor_rx.try_recv() {
|
||||
Ok(work) => {
|
||||
assert_eq!(work.work_type(), beacon_processor::CHAIN_SEGMENT);
|
||||
assert_eq!(work.work_type(), beacon_processor::WorkType::ChainSegment);
|
||||
}
|
||||
other => panic!("Expected chain segment process, found {:?}", other),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user