GracePeriod rename

IntersectMBO · Sep 18, 2024 · 8bf522b · 8bf522b
1 parent 8acf57f
commit 8bf522b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/ouroboros-network/demo/chain-sync.hs b/ouroboros-network/demo/chain-sync.hs
@@ -519,7 +519,7 @@ clientBlockFetch sockAddrs maxSlotNo = withIOManager $ \iocp -> do
                         bfcDecisionLoopIntervalPraos = 0.01,
                         bfcSalt                   = 0,
                         bfcGenesisBFConfig        = GenesisBlockFetchConfiguration
-                          { gbfcGenesisGracePeriod = 10 -- seconds
+                          { gbfcGracePeriod = 10 -- seconds
                           }
                         })
                  >> return ()

diff --git a/ouroboros-network/sim-tests-lib/Ouroboros/Network/BlockFetch/Examples.hs b/ouroboros-network/sim-tests-lib/Ouroboros/Network/BlockFetch/Examples.hs
@@ -145,7 +145,7 @@ blockFetchExample0 fetchMode decisionTracer clientStateTracer clientMsgTracer
             bfcDecisionLoopIntervalPraos = 0.01,
             bfcSalt                   = 0,
             bfcGenesisBFConfig        = GenesisBlockFetchConfiguration
-              { gbfcGenesisGracePeriod = 10 -- seconds
+              { gbfcGracePeriod = 10 -- seconds
               }
           })
         >> return ()
@@ -258,7 +258,7 @@ blockFetchExample1 fetchMode decisionTracer clientStateTracer clientMsgTracer
             bfcDecisionLoopIntervalPraos = 0.01,
             bfcSalt                   = 0,
             bfcGenesisBFConfig        = GenesisBlockFetchConfiguration
-              { gbfcGenesisGracePeriod = 10 -- seconds
+              { gbfcGracePeriod = 10 -- seconds
               }
           })
         >> return ()

diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs
@@ -302,7 +302,7 @@ run blockGeneratorArgs limits ni na tracersExtra tracerBlockFetch =
           bfcDecisionLoopIntervalPraos = 0.01,
           bfcSalt                   = 0,
           bfcGenesisBFConfig        = GenesisBlockFetchConfiguration
-            { gbfcGenesisGracePeriod = 10 -- seconds
+            { gbfcGracePeriod = 10 -- seconds
             }
         })
 

diff --git a/ouroboros-network/src/Ouroboros/Network/BlockFetch.hs b/ouroboros-network/src/Ouroboros/Network/BlockFetch.hs
@@ -160,9 +160,9 @@ data BlockFetchConfiguration =
 -- | BlockFetch configuration parameters specific to Genesis.
 data GenesisBlockFetchConfiguration =
      GenesisBlockFetchConfiguration
-      { -- | Grace period when starting to talk to a peer in bulk sync mode
+      { -- | Grace period when starting to talk to a peer in genesis mode
         -- during which it is fine if the chain selection gets starved.
-        gbfcGenesisGracePeriod    :: !DiffTime
+        gbfcGracePeriod :: !DiffTime
       }
       deriving (Eq, Generic, Show)
 
@@ -221,7 +221,7 @@ blockFetchLogic decisionTracer clientStateTracer
         decisionLoopIntervalGenesis = bfcDecisionLoopIntervalGenesis,
         decisionLoopIntervalPraos   = bfcDecisionLoopIntervalPraos,
         peerSalt                    = bfcSalt,
-        bulkSyncGracePeriod         = gbfcGenesisGracePeriod bfcGenesisBFConfig,
+        bulkSyncGracePeriod         = gbfcGracePeriod bfcGenesisBFConfig,
 
         plausibleCandidateChain,
         compareCandidateChains,

diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/Configuration.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/Configuration.hs
@@ -148,7 +148,7 @@ defaultBlockFetchConfiguration bfcSalt =
     bfcDecisionLoopIntervalGenesis = 0.04,  -- 40ms
     bfcDecisionLoopIntervalPraos = 0.01,  -- 10ms
     bfcGenesisBFConfig        = GenesisBlockFetchConfiguration
-      { gbfcGenesisGracePeriod = 10 },  -- seconds
+      { gbfcGracePeriod = 10 },  -- seconds
     bfcSalt }
 
 defaultChainSyncTimeout :: IO ChainSyncTimeout