peer-selection: updateWithState

Also pass `PeerSelectionActions`, which eliminates two extra arguments from `cardanoPeerSelectionGovernorArgs`.
IntersectMBO · Feb 11, 2025 · 1c37cdf · 1c37cdf
1 parent e45f547
commit 1c37cdf
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/...oros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs b/...oros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs
@@ -1270,11 +1270,6 @@ diffusionSimulation
           Cardano.cardanoPublicRootPeersAPI
           (Cardano.cardanoPeerSelectionGovernorArgs
             (Cardano.cardanoExtraArgsToPeerSelectionActions cardanoExtraArgs)
-            peerSharing
-            ( Cardano.updateOutboundConnectionsState
-            $ lpExtraAPI
-            $ Node.iLedgerPeersConsensusInterface
-              interfaces)
           )
           Cardano.cardanoPeerSelectionStatetoCounters
           (flip Cardano.ExtraPeers Set.empty)

diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs
@@ -4015,8 +4015,6 @@ _governorFindingPublicRoots targetNumberOfRootPeers readDomains readUseBootstrap
               genesisPeerTargets    = targets,
               readUseBootstrapPeers = readUseBootstrapPeers
             }
-            peerSharing
-            (Cardano.updateOutboundConnectionsState (lpExtraAPI (getLedgerStateCtx actions)))
 
 
     publicRootPeersProvider

diff --git a/...ros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/MockEnvironment.hs b/...ros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/MockEnvironment.hs
@@ -298,8 +298,6 @@ governorAction mockEnv@GovernorMockEnvironment {
               Cardano.genesisPeerTargets    = snd initialPeerTargets,
               Cardano.readUseBootstrapPeers = readUseBootstrapPeers
             }
-            (peerSharing actions)
-            (Cardano.updateOutboundConnectionsState (lpExtraAPI (getLedgerStateCtx actions)))
 
 
     exploreRaces      -- explore races within the governor

diff --git a/ouroboros-network/src/Ouroboros/Cardano/Network/PeerSelection/Governor/Types.hs b/ouroboros-network/src/Ouroboros/Cardano/Network/PeerSelection/Governor/Types.hs
@@ -24,13 +24,13 @@ import Ouroboros.Cardano.Network.PeerSelection.Governor.Monitor qualified as Car
 import Ouroboros.Cardano.Network.PeerSelection.Governor.PeerSelectionActions qualified as Cardano
 import Ouroboros.Cardano.Network.PeerSelection.Governor.PeerSelectionState qualified as Cardano
 import Ouroboros.Cardano.Network.PublicRootPeers qualified as Cardano
+import Ouroboros.Network.PeerSelection.LedgerPeers (LedgerPeersConsensusInterface (lpExtraAPI))
 import Ouroboros.Network.PeerSelection.Governor (readAssociationMode)
 import Ouroboros.Network.PeerSelection.Governor.Types (AssociationMode (..),
            BootstrapPeersCriticalTimeoutError (..), ExtraGuardedDecisions (..),
-           PeerSelectionInterfaces (..), PeerSelectionGovernorArgs (..),
-           PeerSelectionSetsWithSizes, PeerSelectionState (..),
-           PeerSelectionView (..))
-import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing)
+           PeerSelectionActions (..), PeerSelectionInterfaces (..),
+           PeerSelectionGovernorArgs (..), PeerSelectionSetsWithSizes,
+           PeerSelectionState (..), PeerSelectionView (..))
 import Ouroboros.Network.PeerSelection.PublicRootPeers qualified as PublicRootPeers
 import Ouroboros.Network.PeerSelection.State.EstablishedPeers qualified as EstablishedPeers
 import Ouroboros.Network.PeerSelection.State.LocalRootPeers qualified as LocalRootPeers
@@ -187,8 +187,6 @@ cardanoPeerSelectionGovernorArgs
      , Ord peeraddr
      )
   => Cardano.ExtraPeerSelectionActions m
-  -> PeerSharing
-  -> (OutboundConnectionsState -> STM m ())
   -> PeerSelectionGovernorArgs
        Cardano.ExtraState
        extraDebugState
@@ -200,7 +198,7 @@ cardanoPeerSelectionGovernorArgs
        peerconn
        BootstrapPeersCriticalTimeoutError
        m
-cardanoPeerSelectionGovernorArgs extraActions peerSharing updateOutboundConnectionsState =
+cardanoPeerSelectionGovernorArgs extraActions =
   PeerSelectionGovernorArgs {
     -- If by any chance the node takes more than 15 minutes to converge to a
     -- clean state, we crash the node. This could happen in very rare
@@ -213,11 +211,15 @@ cardanoPeerSelectionGovernorArgs extraActions peerSharing updateOutboundConnecti
         Just t
           | blockedAt >= t -> Just BootstrapPeersCriticalTimeoutError
           | otherwise      -> Nothing
-  , updateWithState = \PeerSelectionInterfaces { readUseLedgerPeers } psv st -> do
+  , updateWithState = \PeerSelectionInterfaces { readUseLedgerPeers }
+                       PeerSelectionActions { getLedgerStateCtx,
+                                              peerSharing }
+                       psv st -> do
       associationMode <- readAssociationMode readUseLedgerPeers
                                              peerSharing
                                              (Cardano.bootstrapPeersFlag (extraState st))
-      updateOutboundConnectionsState
+      Cardano.updateOutboundConnectionsState
+        (lpExtraAPI getLedgerStateCtx)
         (outboundConnectionsState associationMode psv st)
   , extraDecisions  =
       ExtraGuardedDecisions {

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs
@@ -613,7 +613,7 @@ peerSelectionGovernorLoop tracer
               peerSelectionStateToView extraPeersToSet extraStateToExtraCounters st''
 
         -- Custom STM actions
-        updateWithState interfaces peerSelectionView st''
+        updateWithState interfaces actions peerSelectionView st''
 
         -- Update counters
         counters <- readTVar countersVar

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs
@@ -590,6 +590,7 @@ data PeerSelectionGovernorArgs extraState extraDebugState extraFlags
       -> Maybe exception
   , updateWithState
       :: PeerSelectionInterfaces extraState extraFlags extraPeers extraCounters peeraddr peerconn m
+      -> PeerSelectionActions extraState extraFlags extraPeers extraAPI extraCounters peeraddr peerconn m
       -> PeerSelectionSetsWithSizes extraCounters peeraddr
       -> PeerSelectionState extraState extraFlags extraPeers peeraddr peerconn
       -> STM m ()