From 8bf522b68527beae4270ade3e66f8d123ee99036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= Date: Tue, 20 Aug 2024 20:42:35 +0000 Subject: [PATCH] GracePeriod rename --- ouroboros-network/demo/chain-sync.hs | 2 +- .../sim-tests-lib/Ouroboros/Network/BlockFetch/Examples.hs | 4 ++-- .../sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs | 2 +- ouroboros-network/src/Ouroboros/Network/BlockFetch.hs | 6 +++--- .../src/Ouroboros/Network/Diffusion/Configuration.hs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ouroboros-network/demo/chain-sync.hs b/ouroboros-network/demo/chain-sync.hs index fb23efc56d..ab2c55db3f 100644 --- 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 index 92f45559eb..458a3b120d 100644 --- 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 index b5be50f981..fed35a188e 100644 --- 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 index 1627ff96e1..6d6faae62c 100644 --- 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 index 8dec8bc7c1..e3df3fe280 100644 --- 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