ChainDB: better names for validation arguments

IntersectMBO · Feb 13, 2020 · ba2a97a · ba2a97a
1 parent 581b236
commit ba2a97a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Node.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Node.hs
@@ -143,11 +143,11 @@ run tracers protocolTracers chainDbTracer diffusionTracers diffusionArguments
               -- When the last shutdown was not clean, validate the complete
               -- ChainDB to detect and recover from any corruptions. This will
               -- override the default value /and/ the user-customised value of
-              -- the 'ChainDB.cdbValidation' and the
-              -- 'ChainDB.cdbBlockValidation' fields.
+              -- the 'ChainDB.cdbImmValidation' and the
+              -- 'ChainDB.cdbVolValidation' fields.
             = (customiseChainDbArgs args)
-              { ChainDB.cdbValidation      = ValidateAllEpochs
-              , ChainDB.cdbBlockValidation = ValidateAll
+              { ChainDB.cdbImmValidation = ValidateAllEpochs
+              , ChainDB.cdbVolValidation = ValidateAll
               }
 
       -- On a clean shutdown, create a marker in the database folder so that
@@ -287,8 +287,8 @@ mkChainDbArgs tracer registry btime dbPath cfg initLedger
     , ChainDB.cdbNodeConfig       = cfg
     , ChainDB.cdbRegistry         = registry
     , ChainDB.cdbTracer           = tracer
-    , ChainDB.cdbValidation       = ValidateMostRecentEpoch
-    , ChainDB.cdbBlockValidation  = NoValidation
+    , ChainDB.cdbImmValidation    = ValidateMostRecentEpoch
+    , ChainDB.cdbVolValidation    = NoValidation
     , ChainDB.cdbGcDelay          = secondsToDiffTime 10
     , ChainDB.cdbBlockchainTime   = btime
     }

diff --git a/ouroboros-consensus/src/Ouroboros/Storage/ChainDB/Impl/Args.hs b/ouroboros-consensus/src/Ouroboros/Storage/ChainDB/Impl/Args.hs
@@ -83,8 +83,8 @@ data ChainDbArgs m blk = forall h1 h2 h3. ChainDbArgs {
     , cdbHasFSLgrDB       :: HasFS m h3
 
       -- Policy
-    , cdbValidation       :: ImmDB.ValidationPolicy
-    , cdbBlockValidation  :: VolDB.BlockValidationPolicy
+    , cdbImmValidation    :: ImmDB.ValidationPolicy
+    , cdbVolValidation    :: VolDB.BlockValidationPolicy
     , cdbBlocksPerFile    :: VolDB.BlocksPerFile
     , cdbParamsLgrDB      :: LgrDB.LedgerDbParams
     , cdbDiskPolicy       :: LgrDB.DiskPolicy
@@ -173,7 +173,7 @@ fromChainDbArgs ChainDbArgs{..} = (
         , immErr              = cdbErrImmDb
         , immEpochInfo        = cdbEpochInfo
         , immHashInfo         = cdbHashInfo
-        , immValidation       = cdbValidation
+        , immValidation       = cdbImmValidation
         , immIsEBB            = cdbIsEBB
         , immCheckIntegrity   = cdbCheckIntegrity
         , immHasFS            = cdbHasFSImmDb
@@ -193,7 +193,7 @@ fromChainDbArgs ChainDbArgs{..} = (
         , volDecodeBlock      = cdbDecodeBlock
         , volEncodeBlock      = cdbEncodeBlock
         , volAddHdrEnv        = cdbAddHdrEnv
-        , volValidation       = cdbBlockValidation
+        , volValidation       = cdbVolValidation
         , volTracer           = contramap TraceVolDBEvent cdbTracer
         , volIsEBB            = \blk -> case cdbIsEBB (getHeader blk) of
                                           Nothing -> IsNotEBB
@@ -261,8 +261,8 @@ toChainDbArgs ImmDB.ImmDbArgs{..}
     , cdbHasFSVolDb       = volHasFS
     , cdbHasFSLgrDB       = lgrHasFS
       -- Policy
-    , cdbValidation       = immValidation
-    , cdbBlockValidation  = volValidation
+    , cdbImmValidation    = immValidation
+    , cdbVolValidation    = volValidation
     , cdbBlocksPerFile    = volBlocksPerFile
     , cdbParamsLgrDB      = lgrParams
     , cdbDiskPolicy       = lgrDiskPolicy

diff --git a/ouroboros-consensus/test-consensus/Test/ThreadNet/Network.hs b/ouroboros-consensus/test-consensus/Test/ThreadNet/Network.hs
@@ -533,8 +533,8 @@ runThreadNetwork ThreadNetworkArgs
         , cdbHasFSVolDb       = simHasFS EH.monadCatch (nodeDBsVol nodeDBs)
         , cdbHasFSLgrDB       = simHasFS EH.monadCatch (nodeDBsLgr nodeDBs)
           -- Policy
-        , cdbValidation       = ImmDB.ValidateAllEpochs
-        , cdbBlockValidation  = VolDB.ValidateAll
+        , cdbImmValidation    = ImmDB.ValidateAllEpochs
+        , cdbVolValidation    = VolDB.ValidateAll
         , cdbBlocksPerFile    = VolDB.mkBlocksPerFile 4
         , cdbParamsLgrDB      = LgrDB.ledgerDbDefaultParams (protocolSecurityParam cfg)
         , cdbDiskPolicy       = LgrDB.defaultDiskPolicy (protocolSecurityParam cfg)

diff --git a/ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ChainDB/AddBlock.hs b/ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ChainDB/AddBlock.hs
@@ -267,8 +267,8 @@ mkArgs cfg initLedger tracer registry hashInfo
     , cdbHasFSLgrDB       = simHasFS EH.monadCatch lgrDbFsVar
 
       -- Policy
-    , cdbValidation       = ValidateAllEpochs
-    , cdbBlockValidation  = ValidateAll
+    , cdbImmValidation    = ValidateAllEpochs
+    , cdbVolValidation    = ValidateAll
     , cdbBlocksPerFile    = mkBlocksPerFile 4
     , cdbParamsLgrDB      = ledgerDbDefaultParams (protocolSecurityParam cfg)
     , cdbDiskPolicy       = defaultDiskPolicy (protocolSecurityParam cfg)

diff --git a/ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ChainDB/StateMachine.hs b/ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ChainDB/StateMachine.hs
@@ -1455,8 +1455,8 @@ mkArgs cfg initLedger tracer registry varCurSlot
     , cdbHasFSLgrDB       = simHasFS EH.monadCatch lgrDbFsVar
 
       -- Policy
-    , cdbValidation       = ValidateAllEpochs
-    , cdbBlockValidation  = VolDB.ValidateAll
+    , cdbImmValidation    = ValidateAllEpochs
+    , cdbVolValidation    = VolDB.ValidateAll
     , cdbBlocksPerFile    = VolDB.mkBlocksPerFile 4
     , cdbParamsLgrDB      = LedgerDbParams {
                                 -- Pick a small value for 'ledgerDbSnapEvery',

diff --git a/ouroboros-consensus/tools/db-convert/Main.hs b/ouroboros-consensus/tools/db-convert/Main.hs
@@ -204,5 +204,5 @@ validateChainDb dbDir genesisConfig onlyImmDB verbose =
       let args = Node.mkChainDbArgs tracer registry btime
             (toFilePath dbDir) cfg initLedger epochInfo
       in args {
-          ChainDB.cdbValidation = ImmDB.ValidateAllEpochs
+          ChainDB.cdbImmValidation = ImmDB.ValidateAllEpochs
         }