Merge branch 'unstable' into off-4844

This commit is contained in:
Diva M
2023-03-02 15:38:00 -05:00
86 changed files with 1224 additions and 316 deletions

View File

@@ -1551,7 +1551,7 @@ impl<T: BeaconChainTypes> BeaconProcessor<T> {
gossip_block_queue.len() as i64,
);
metrics::set_gauge(
&metrics::BEACON_PROCESSOR_RPC_BLOB_QUEUE_TOTAL,
&metrics::BEACON_PROCESSOR_RPC_BLOCK_QUEUE_TOTAL,
rpc_block_queue.len() as i64,
);
metrics::set_gauge(

View File

@@ -182,6 +182,7 @@ mod attestation_service {
#[cfg(feature = "deterministic_long_lived_attnets")]
use std::collections::HashSet;
#[cfg(not(windows))]
use crate::subnet_service::attestation_subnets::MIN_PEER_DISCOVERY_SLOT_LOOK_AHEAD;
use super::*;
@@ -290,6 +291,7 @@ mod attestation_service {
}
/// Test to verify that we are not unsubscribing to a subnet before a required subscription.
#[cfg(not(windows))]
#[tokio::test]
async fn test_same_subnet_unsubscription() {
// subscription config
@@ -513,6 +515,7 @@ mod attestation_service {
assert_eq!(unexpected_msg_count, 0);
}
#[cfg(not(windows))]
#[tokio::test]
async fn test_subscribe_same_subnet_several_slots_apart() {
// subscription config