outbound-governor: renamed fuzzRng to stdGen

A more generic name suits better since we want to use it not just for random delays.
IntersectMBO · May 7, 2024 · c0adb9f · c0adb9f
1 parent f87f9c6
commit c0adb9f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/ActivePeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/ActivePeers.hs
@@ -339,7 +339,7 @@ jobPromoteWarmPeer PeerSelectionActions{peerStateActions = PeerStateActions {act
                                  activePeers,
                                  establishedPeers,
                                  knownPeers,
-                                 fuzzRng,
+                                 stdGen,
                                  targets = PeerSelectionTargets {
                                              targetNumberOfActivePeers,
                                              targetNumberOfActiveBigLedgerPeers
@@ -352,7 +352,7 @@ jobPromoteWarmPeer PeerSelectionActions{peerStateActions = PeerStateActions {act
            in if peeraddr `Set.member` inProgressPromoteWarm st
                  then let establishedPeers' = EstablishedPeers.delete peeraddr
                                                 establishedPeers
-                          (fuzz, fuzzRng')  = randomR (-2, 2 :: Double) fuzzRng
+                          (fuzz, stdGen')  = randomR (-2, 2 :: Double) stdGen
                           delay             = realToFrac fuzz + policyErrorDelay
                           knownPeers'       = if peeraddr `KnownPeers.member` knownPeers
                                                  then KnownPeers.setConnectTimes
@@ -387,7 +387,7 @@ jobPromoteWarmPeer PeerSelectionActions{peerStateActions = PeerStateActions {act
                                                                     (inProgressPromoteWarm st),
                                           knownPeers            = knownPeers',
                                           establishedPeers      = establishedPeers',
-                                          fuzzRng               = fuzzRng'
+                                          stdGen                = stdGen'
                                         },
                         decisionJobs  = []
                       }

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/EstablishedPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/EstablishedPeers.hs
@@ -368,7 +368,7 @@ jobPromoteColdPeer PeerSelectionActions {
       Completion $ \st@PeerSelectionState {
                       publicRootPeers,
                       establishedPeers,
-                      fuzzRng,
+                      stdGen,
                       targets = PeerSelectionTargets {
                                   targetNumberOfEstablishedPeers,
                                   targetNumberOfEstablishedBigLedgerPeers
@@ -378,7 +378,7 @@ jobPromoteColdPeer PeerSelectionActions {
         let (failCount, knownPeers') = KnownPeers.incrementFailCount
                                          peeraddr
                                          (knownPeers st)
-            (fuzz, fuzzRng') = randomR (-2, 2 :: Double) fuzzRng
+            (fuzz, stdGen') = randomR (-2, 2 :: Double) stdGen
 
             -- exponential backoff: 5s, 10s, 20s, 40s, 80s, 160s.
             delay :: DiffTime
@@ -409,7 +409,7 @@ jobPromoteColdPeer PeerSelectionActions {
                                                         knownPeers',
                               inProgressPromoteCold = Set.delete peeraddr
                                                         (inProgressPromoteCold st),
-                              fuzzRng = fuzzRng'
+                              stdGen = stdGen'
                             },
             decisionJobs  = []
           }

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/KnownPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/KnownPeers.hs
@@ -64,7 +64,7 @@ belowTarget actions
                         },
               ledgerStateJudgement,
               bootstrapPeersFlag,
-              fuzzRng
+              stdGen
             }
     -- Only start Peer Sharing request if PeerSharing was enabled
   | PeerSharingEnabled <- peerSharing actions
@@ -99,7 +99,7 @@ belowTarget actions
           numPeersToReq :: PeerSharingAmount
           !numPeersToReq = fromIntegral
                          $ min 255 (max 8 (objective `div` numPeerShareReqs))
-          (salt, fuzzRng') = random fuzzRng
+          (salt, stdGen') = random stdGen
 
       return $ \now -> Decision {
         decisionTrace = [TracePeerShareRequests
@@ -115,7 +115,7 @@ belowTarget actions
                                               selectedForPeerShare
                                               (addTime policyPeerShareRetryTime now)
                                               establishedPeers,
-                          fuzzRng = fuzzRng'
+                          stdGen = stdGen'
                         },
         decisionJobs  =
           [jobPeerShare actions policy objective salt numPeersToReq

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Monitor.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Monitor.hs
@@ -207,7 +207,7 @@ connections PeerSelectionActions{
               inProgressDemoteWarm,
               inProgressPromoteWarm,
               inProgressDemoteToCold,
-              fuzzRng
+              stdGen
             } =
     Guarded Nothing $ do
       -- Get previously cooling peers
@@ -218,8 +218,8 @@ connections PeerSelectionActions{
       let (demotedToWarm, demotedToCoolingOrCold) = Map.partition ((==PeerWarm) . fst) demotions
           (demotedToCold, demotedToCooling) = Map.partition ((==PeerCold) . fst) demotedToCoolingOrCold
           -- fuzz reconnect delays
-          (aFuzz, fuzzRng')  = randomR (0.1, 10 :: Double) fuzzRng
-          (rFuzz, fuzzRng'') = randomR (0.1, 4  :: Double) fuzzRng'
+          (aFuzz, stdGen')  = randomR (0.1, 10 :: Double) stdGen
+          (rFuzz, stdGen'') = randomR (0.1, 4  :: Double) stdGen'
           demotions' = (\a@(peerState, repromoteDelay) -> case peerState of
                          PeerHot  -> a
                          PeerWarm ->
@@ -310,7 +310,7 @@ connections PeerSelectionActions{
                                 -- to not include peers in those sets. Instead,
                                 -- those ones will complete synchronously.
 
-                                fuzzRng = fuzzRng''
+                                stdGen = stdGen''
                               }
           }
   where

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs
@@ -436,8 +436,9 @@ data PeerSelectionState peeraddr peerconn = PeerSelectionState {
        -- being closed
        inProgressDemoteToCold      :: !(Set peeraddr),
 
-       -- | Rng for fuzzy delay
-       fuzzRng                     :: !StdGen,
+       -- | Rng for fuzzy delays and random choices.
+       --
+       stdGen                      :: !StdGen,
 
        -- | 'PeerSelectionCounters' counters cache. Allows to only trace
        -- values when necessary.
@@ -632,7 +633,7 @@ emptyPeerSelectionState rng localRoots =
       inProgressDemoteWarm        = Set.empty,
       inProgressDemoteHot         = Set.empty,
       inProgressDemoteToCold      = Set.empty,
-      fuzzRng                     = rng,
+      stdGen                      = rng,
       countersCache               = Cache (PeerSelectionCounters 0 0 0 0 0 0 localRoots),
       ledgerStateJudgement        = TooOld,
       bootstrapPeersFlag          = DontUseBootstrapPeers,