db-analyser: don't let .Types depend on .Analysis

In a later commit, this is useful to avoid cyclic imports when adding new types
to `.Types` that are also used in other modules.

Author: amesgen

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Analysis.hs

@@ -1,16 +1,15 @@
-{-# LANGUAGE BangPatterns               #-}
-{-# LANGUAGE BlockArguments             #-}
-{-# LANGUAGE DataKinds                  #-}
-{-# LANGUAGE FlexibleContexts           #-}
-{-# LANGUAGE GADTs                      #-}
-{-# LANGUAGE GeneralisedNewtypeDeriving #-}
-{-# LANGUAGE LambdaCase                 #-}
-{-# LANGUAGE NamedFieldPuns             #-}
-{-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE ScopedTypeVariables        #-}
-{-# LANGUAGE TupleSections              #-}
-{-# LANGUAGE TypeApplications           #-}
-{-# LANGUAGE TypeFamilies               #-}
+{-# LANGUAGE BangPatterns        #-}
+{-# LANGUAGE BlockArguments      #-}
+{-# LANGUAGE DataKinds           #-}
+{-# LANGUAGE FlexibleContexts    #-}
+{-# LANGUAGE GADTs               #-}
+{-# LANGUAGE LambdaCase          #-}
+{-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TupleSections       #-}
+{-# LANGUAGE TypeApplications    #-}
+{-# LANGUAGE TypeFamilies        #-}
 
 module Cardano.Tools.DBAnalyser.Analysis (
     AnalysisEnv (..)
@@ -33,6 +32,7 @@ import           Cardano.Tools.DBAnalyser.CSV (computeAndWriteLine,
                      writeHeaderLine)
 import           Cardano.Tools.DBAnalyser.HasAnalysis (HasAnalysis)
 import qualified Cardano.Tools.DBAnalyser.HasAnalysis as HasAnalysis
+import           Cardano.Tools.DBAnalyser.Types
 import           Codec.CBOR.Encoding (Encoding)
 import           Control.Monad (unless, void, when)
 import           Control.Monad.Except (runExcept)
@@ -83,39 +83,6 @@ import qualified System.IO as IO
   Run the requested analysis
 -------------------------------------------------------------------------------}
 
-data AnalysisName =
-    ShowSlotBlockNo
-  | CountTxOutputs
-  | ShowBlockHeaderSize
-  | ShowBlockTxsSize
-  | ShowEBBs
-  | OnlyValidation
-  | StoreLedgerStateAt SlotNo LedgerApplicationMode
-  | CountBlocks
-  | CheckNoThunksEvery Word64
-  | TraceLedgerProcessing
-  | BenchmarkLedgerOps (Maybe FilePath)
-  | ReproMempoolAndForge Int
-    -- | Compute different block application metrics every 'NumberOfBlocks'.
-    --
-    -- The metrics will be written to the provided file path, or to
-    -- the standard output if no file path is specified.
-  | GetBlockApplicationMetrics NumberOfBlocks (Maybe FilePath)
-  deriving Show
-
-data AnalysisResult =
-    ResultCountBlock Int
-  | ResultMaxHeaderSize Word16
-  deriving (Eq, Show)
-
-newtype NumberOfBlocks = NumberOfBlocks { unNumberOfBlocks :: Word64 }
-  deriving (Eq, Show, Num, Read)
-
--- | Whether to apply blocks to a ledger state via /reapplication/ (eg skipping
--- signature checks/Plutus scripts) or full /application/ (much slower).
-data LedgerApplicationMode = LedgerReapply | LedgerApply
-  deriving (Eq, Show)
-
 runAnalysis ::
      forall blk.
      ( HasAnalysis blk
@@ -877,8 +844,6 @@ reproMempoolForge numBlks env = do
   Auxiliary: processing all blocks in the DB
 -------------------------------------------------------------------------------}
 
-data Limit = Limit Int | Unlimited
-
 decreaseLimit :: Limit -> Maybe Limit
 decreaseLimit Unlimited = Just Unlimited
 decreaseLimit (Limit 0) = Nothing

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Types.hs

@@ -1,11 +1,8 @@
-module Cardano.Tools.DBAnalyser.Types (
-    module AnalysisTypes
-  , module Cardano.Tools.DBAnalyser.Types
-  ) where
-
-import           Cardano.Tools.DBAnalyser.Analysis as AnalysisTypes
-                     (AnalysisName (..), AnalysisResult (..), Limit (..),
-                     NumberOfBlocks (..))
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Cardano.Tools.DBAnalyser.Types (module Cardano.Tools.DBAnalyser.Types) where
+
+import           Data.Word
 import           Ouroboros.Consensus.Block
 
 data SelectDB =
@@ -20,6 +17,41 @@ data DBAnalyserConfig = DBAnalyserConfig {
   , confLimit  :: Limit
   }
 
+data AnalysisName =
+    ShowSlotBlockNo
+  | CountTxOutputs
+  | ShowBlockHeaderSize
+  | ShowBlockTxsSize
+  | ShowEBBs
+  | OnlyValidation
+  | StoreLedgerStateAt SlotNo LedgerApplicationMode
+  | CountBlocks
+  | CheckNoThunksEvery Word64
+  | TraceLedgerProcessing
+  | BenchmarkLedgerOps (Maybe FilePath)
+  | ReproMempoolAndForge Int
+    -- | Compute different block application metrics every 'NumberOfBlocks'.
+    --
+    -- The metrics will be written to the provided file path, or to
+    -- the standard output if no file path is specified.
+  | GetBlockApplicationMetrics NumberOfBlocks (Maybe FilePath)
+  deriving Show
+
+data AnalysisResult =
+    ResultCountBlock Int
+  | ResultMaxHeaderSize Word16
+  deriving (Eq, Show)
+
+newtype NumberOfBlocks = NumberOfBlocks { unNumberOfBlocks :: Word64 }
+  deriving (Eq, Show, Num, Read)
+
+data Limit = Limit Int | Unlimited
+
 -- | The extent of the ChainDB on-disk files validation. This is completely
 -- unrelated to validation of the ledger rules.
 data ValidateBlocks = ValidateAllBlocks | MinimumBlockValidation
+
+-- | Whether to apply blocks to a ledger state via /reapplication/ (eg skipping
+-- signature checks/Plutus scripts) or full /application/ (much slower).
+data LedgerApplicationMode = LedgerReapply | LedgerApply
+  deriving (Eq, Show)