CAD-2907 stub compute: calibrate at startup, with configurable targets

IntersectMBO · Jun 18, 2021 · f0eb0d3 · f0eb0d3
1 parent 711bb77
commit f0eb0d3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/cardano-node/src/Cardano/Node/Configuration/POM.hs b/cardano-node/src/Cardano/Node/Configuration/POM.hs
@@ -237,10 +237,14 @@ instance FromJSON PartialNodeConfiguration where
             (Just _, Just _)   -> fail $ "Specify either ShelleyGenesisFile"
                                       ++ "or GenesisFile, but not both"
         npcShelleyGenesisFileHash <- v .:? "ShelleyGenesisHash"
+        npcStubComputeDuration  <- fromMaybe 0.05  <$> v .:? "StubComputeDuration"
+        npcStubComputePrecision <- fromMaybe 0.005 <$> v .:? "StubComputePrecision"
 
         pure NodeShelleyProtocolConfiguration {
                npcShelleyGenesisFile
              , npcShelleyGenesisFileHash
+             , npcStubComputeDuration
+             , npcStubComputePrecision
              }
 
       parseAlonzoProtocol v = do

diff --git a/cardano-node/src/Cardano/Node/Protocol/Cardano.hs b/cardano-node/src/Cardano/Node/Protocol/Cardano.hs
@@ -15,6 +15,7 @@ module Cardano.Node.Protocol.Cardano
 
 import           Prelude
 
+import           Control.Monad.IO.Class (liftIO)
 import           Control.Monad.Trans.Except (ExceptT)
 import           Control.Monad.Trans.Except.Extra (firstExceptT)
 
@@ -26,6 +27,7 @@ import qualified Ouroboros.Consensus.Cardano.CanHardFork as Consensus
 import           Ouroboros.Consensus.HardFork.Combinator.Condense ()
 
 import           Ouroboros.Consensus.Cardano.Condense ()
+import           Ouroboros.Consensus.Shelley.Ledger.Stub
 
 import           Cardano.Api
 import           Cardano.Api.Orphans ()
@@ -77,7 +79,9 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
                            }
                            NodeShelleyProtocolConfiguration {
                              npcShelleyGenesisFile,
-                             npcShelleyGenesisFileHash
+                             npcShelleyGenesisFileHash,
+                             npcStubComputeDuration,
+                             npcStubComputePrecision
                            }
                            NodeAlonzoProtocolConfiguration {
                              npcAlonzoGenesisFile,
@@ -95,6 +99,11 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
                              npcTestAlonzoHardForkAtVersion
                            }
                            files = do
+    liftIO $
+      calibrateStubComputationArgForTime
+        npcStubComputeDuration
+        npcStubComputePrecision
+
     byronGenesis <-
       firstExceptT CardanoProtocolInstantiationErrorByron $
         Byron.readGenesis npcByronGenesisFile

diff --git a/cardano-node/src/Cardano/Node/Types.hs b/cardano-node/src/Cardano/Node/Types.hs
@@ -270,6 +270,8 @@ data NodeShelleyProtocolConfiguration =
      NodeShelleyProtocolConfiguration {
        npcShelleyGenesisFile     :: !GenesisFile
      , npcShelleyGenesisFileHash :: !(Maybe GenesisHash)
+     , npcStubComputeDuration    :: !Double
+     , npcStubComputePrecision   :: !Double
      }
   deriving (Eq, Show)