churn: WIP (fixup)

IntersectMBO · Apr 16, 2024 · 4257058 · 4257058
1 parent 1ecaf98
commit 4257058
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Churn.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Churn.hs
@@ -186,11 +186,10 @@ peerChurnGovernor tracer churnTracer
 
     checkActivePeersDecreased :: CheckPeerSelectionCounters
     checkActivePeersDecreased
-      PeerSelectionCounters { numberOfActivePeers, numberOfActivePeersDemotions }
+      PeerSelectionCounters { numberOfActivePeers }
       PeerSelectionTargets { targetNumberOfActivePeers }
       =
          numberOfActivePeers
-       - numberOfActivePeersDemotions
       <= targetNumberOfActivePeers
 
 
@@ -211,12 +210,10 @@ peerChurnGovernor tracer churnTracer
 
     checkEstablishedPeersIncreased :: CheckPeerSelectionCounters
     checkEstablishedPeersIncreased
-      PeerSelectionCounters { numberOfEstablishedPeers,
-                              numberOfColdPeersPromotions }
+      PeerSelectionCounters { numberOfEstablishedPeers }
       PeerSelectionTargets { targetNumberOfEstablishedPeers }
       =
          numberOfEstablishedPeers
-       + numberOfColdPeersPromotions
       >= targetNumberOfEstablishedPeers
 
 
@@ -253,12 +250,10 @@ peerChurnGovernor tracer churnTracer
     checkEstablishedPeersDecreased
       :: CheckPeerSelectionCounters
     checkEstablishedPeersDecreased
-      PeerSelectionCounters { numberOfEstablishedPeers,
-                              numberOfWarmPeersDemotions }
+      PeerSelectionCounters { numberOfEstablishedPeers }
       PeerSelectionTargets { targetNumberOfEstablishedPeers }
       =
          numberOfEstablishedPeers
-       - numberOfWarmPeersDemotions
       <= targetNumberOfEstablishedPeers
 
 
@@ -303,12 +298,10 @@ peerChurnGovernor tracer churnTracer
     checkActiveBigLedgerPeersDecreased
       :: CheckPeerSelectionCounters
     checkActiveBigLedgerPeersDecreased
-      PeerSelectionCounters { numberOfActiveBigLedgerPeers,
-                              numberOfActiveBigLedgerPeersDemotions }
+      PeerSelectionCounters { numberOfActiveBigLedgerPeers }
       PeerSelectionTargets { targetNumberOfActiveBigLedgerPeers }
       =
          numberOfActiveBigLedgerPeers
-       - numberOfActiveBigLedgerPeersDemotions
       <= targetNumberOfActiveBigLedgerPeers
 
 
@@ -325,12 +318,10 @@ peerChurnGovernor tracer churnTracer
     checkEstablishedBigLedgerPeersDecreased
       :: CheckPeerSelectionCounters
     checkEstablishedBigLedgerPeersDecreased
-      PeerSelectionCounters { numberOfEstablishedBigLedgerPeers,
-                              numberOfWarmBigLedgerPeersDemotions }
+      PeerSelectionCounters { numberOfEstablishedBigLedgerPeers }
       PeerSelectionTargets { targetNumberOfEstablishedBigLedgerPeers }
       =
          numberOfEstablishedBigLedgerPeers
-       - numberOfWarmBigLedgerPeersDemotions
       <= targetNumberOfEstablishedBigLedgerPeers