Config for ledgerpeers

Make the slot number that we start to use peers from the ledger configurable.
IntersectMBO · Jan 14, 2021 · 2db0961 · 2db0961
1 parent e095316
commit 2db0961
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion.hs
@@ -261,6 +261,7 @@ data DiffusionArguments = DiffusionArguments {
     , daStaticLocalRootPeers :: [(Socket.SockAddr, PeerAdvertise)]
     , daLocalRootPeers       :: [(DomainAddress, PeerAdvertise)]
     , daPublicRootPeers      :: [DomainAddress]
+    , daUseLedgerAfter       :: UseLedgerAfter
 
     , daAcceptedConnectionsLimit :: AcceptedConnectionsLimit
       -- ^ parameters for limiting number of accepted connections
@@ -554,6 +555,7 @@ runDataDiffusion tracers
                                     , daStaticLocalRootPeers
                                     , daLocalRootPeers
                                     , daPublicRootPeers
+                                    , daUseLedgerAfter
                                     , daAcceptedConnectionsLimit
                                     , daDiffusionMode
                                     , daProtocolIdleTimeout
@@ -623,10 +625,6 @@ runDataDiffusion tracers
     -- ledger hasn't caught up to `useLedgerAfter`. May return less than
     -- the number of peers requested.
     ledgerPeersRsp <- newEmptyTMVarIO :: IO (StrictTMVar IO (Maybe (Set SockAddr, DiffTime)))
-    -- Require the ledger to be passed the provided slot number before it is used as a source of
-    -- public root peers.
-    -- After 2020-12-08 14:53:36.03 UTC TODO: Should be configurable
-    let useLedgerAfter = UseLedgerAfter 15872925
 
     let -- snocket for remote communication.
         snocket :: SocketSnocket
@@ -738,7 +736,7 @@ runDataDiffusion tracers
             (runLedgerPeers
               ledgerPeersRng
               dtLedgerPeersTracer
-              useLedgerAfter
+              daUseLedgerAfter
               daLedgerPeersCtx
               (resolveDomainAddresses
                 dtTracePublicRootPeersTracer

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/LedgerPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/LedgerPeers.hs
@@ -48,7 +48,7 @@ import           Ouroboros.Network.PeerSelection.RootPeersDNS (DomainAddress (..
 import           Text.Printf
 
 -- | Only use the ledger after the given slot number.
-data UseLedgerAfter = DontUseLedger | UseLedgerAfter SlotNo deriving Show
+data UseLedgerAfter = DontUseLedger | UseLedgerAfter SlotNo deriving (Eq, Show)
 
 isLedgerPeersEnabled :: UseLedgerAfter -> Bool
 isLedgerPeersEnabled DontUseLedger = False