gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 00:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix flaky test_same_subnet_unsubscription (#8932)

Browse Source 
Co-Authored-By: figtracer <1gusredo@gmail.com>

Co-Authored-By: ackintosh <sora.akatsuki@gmail.com>
This commit is contained in:
Akihito Nakano
2026-03-14 03:27:15 +09:00
committed by GitHub
parent 4b3a9d3d10
commit 53a711956e
2 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
beacon_node/network/src/subnet_service/mod.rs
View File

@@ -198,13 +198,6 @@ impl<T: BeaconChainTypes> SubnetService<T> {
self.permanent_attestation_subscriptions.iter() self.permanent_attestation_subscriptions.iter()
} }
/// Returns whether we are subscribed to a subnet for testing purposes.
#[cfg(test)]
pub(crate) fn is_subscribed(&self, subnet: &Subnet) -> bool {
self.subscriptions.contains_key(subnet)
|| self.permanent_attestation_subscriptions.contains(subnet)
}
/// Returns whether we are subscribed to a permanent subnet for testing purposes. /// Returns whether we are subscribed to a permanent subnet for testing purposes.
#[cfg(test)] #[cfg(test)]
pub(crate) fn is_subscribed_permanent(&self, subnet: &Subnet) -> bool { pub(crate) fn is_subscribed_permanent(&self, subnet: &Subnet) -> bool {

34
beacon_node/network/src/subnet_service/tests/mod.rs
View File

@@ -335,28 +335,26 @@ mod test {
// submit the subscriptions // submit the subscriptions
subnet_service.validator_subscriptions(vec![sub1, sub2].into_iter()); subnet_service.validator_subscriptions(vec![sub1, sub2].into_iter());
// Unsubscription event should happen at slot 2 (since subnet id's are the same, unsubscription event should be at higher slot + 1) let subnet = Subnet::Attestation(subnet_id1);
let expected = SubnetServiceMessage::Subscribe(Subnet::Attestation(subnet_id1));
if subnet_service.is_subscribed(&Subnet::Attestation(subnet_id1)) { if subnet_service.is_subscribed_permanent(&subnet) {
// If we are permanently subscribed to this subnet, we won't see a subscribe message // If permanently subscribed, no Subscribe/Unsubscribe events will be generated
let _ = get_events_until_num_slots(&mut subnet_service, None, 1).await; let events = get_events_until_num_slots(&mut subnet_service, None, 3).await;
assert!(events.is_empty());
} else { } else {
let subscription = get_events_until_num_slots(&mut subnet_service, None, 1).await; // Wait 1 slot: expect a single Subscribe event (no duplicate for the same subnet).
assert_eq!(subscription, [expected]); let events = get_events_until_num_slots(&mut subnet_service, None, 1).await;
assert_eq!(events, [SubnetServiceMessage::Subscribe(subnet)]);
// Wait for the Unsubscribe event after subscription_slot2 expires.
// Use a longer timeout because the test doesn't start exactly at a slot
// boundary, so the previous 1-slot wait may end partway through slot 1,
// leaving insufficient time to catch the Unsubscribe within another 1 slot.
let events = get_events_until_num_slots(&mut subnet_service, Some(1), 3).await;
assert_eq!(events, [SubnetServiceMessage::Unsubscribe(subnet)]);
} }
// Get event for 1 more slot duration, we should get the unsubscribe event now. // Should no longer be subscribed to any short lived subnets after unsubscription.
let unsubscribe_event = get_events_until_num_slots(&mut subnet_service, None, 1).await;
// If the long lived and short lived subnets are different, we should get an unsubscription
// event.
let expected = SubnetServiceMessage::Unsubscribe(Subnet::Attestation(subnet_id1));
if !subnet_service.is_subscribed(&Subnet::Attestation(subnet_id1)) {
assert_eq!([expected], unsubscribe_event[..]);
}
// Should no longer be subscribed to any short lived subnets after unsubscription.
assert_eq!(subnet_service.subscriptions().count(), 0); assert_eq!(subnet_service.subscriptions().count(), 0);
} }