Remove consensus internal options from cli flags

IntersectMBO · Apr 30, 2024 · 2d77caa · 2d77caa
1 parent d1f30b5
commit 2d77caa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 52 deletions.
diff --git a/cardano-node/src/Cardano/Node/Parsers.hs b/cardano-node/src/Cardano/Node/Parsers.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE ApplicativeDo #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE TupleSections #-}
-{-# LANGUAGE TypeApplications #-}
 
 module Cardano.Node.Parsers
   ( nodeCLIParser
@@ -20,17 +19,11 @@ import           Cardano.Node.Configuration.Socket
 import           Cardano.Node.Handlers.Shutdown
 import           Cardano.Node.Types
 import           Cardano.Prelude (ConvertText (..))
-import           Ouroboros.Consensus.Mempool (MempoolCapacityBytes (..),
-                   MempoolCapacityBytesOverride (..))
-import           Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (NumOfDiskSnapshots (..),
-                   SnapshotInterval (..))
 
 import           Data.Foldable
 import           Data.Maybe (fromMaybe)
 import           Data.Monoid (Last (..))
 import           Data.Text (Text)
-import           Data.Time.Clock (secondsToDiffTime)
-import           Data.Word (Word32)
 import           Options.Applicative hiding (str)
 import qualified Options.Applicative as Opt
 import qualified Options.Applicative.Help as OptI
@@ -70,15 +63,11 @@ nodeRunParser = do
 
   -- NodeConfiguration filepath
   nodeConfigFp <- lastOption parseConfigFile
-  numOfDiskSnapshots <- lastOption parseNumOfDiskSnapshots
-  snapshotInterval   <- lastOption parseSnapshotInterval
 
   validate <- lastOption parseValidateDB
   shutdownIPC <- lastOption parseShutdownIPC
   shutdownOnLimit <- lastOption parseShutdownOn
 
-  maybeMempoolCapacityOverride <- lastOption parseMempoolCapacityOverride
-
   pure $ PartialNodeConfiguration
            { pncSocketConfig =
                Last . Just $ SocketConfig
@@ -90,8 +79,8 @@ nodeRunParser = do
            , pncTopologyFile = TopologyFile <$> topFp
            , pncDatabaseFile = DbFile <$> dbFp
            , pncDiffusionMode = mempty
-           , pncNumOfDiskSnapshots = numOfDiskSnapshots
-           , pncSnapshotInterval = snapshotInterval
+           , pncNumOfDiskSnapshots = mempty
+           , pncSnapshotInterval = mempty
            , pncExperimentalProtocolsEnabled = mempty
            , pncProtocolFiles = Last $ Just ProtocolFilepaths
              { byronCertFile
@@ -112,7 +101,7 @@ nodeRunParser = do
            , pncLogMetrics = mempty
            , pncTraceConfig = mempty
            , pncTraceForwardSocket = traceForwardSocket
-           , pncMaybeMempoolCapacityOverride = maybeMempoolCapacityOverride
+           , pncMaybeMempoolCapacityOverride = mempty
            , pncProtocolIdleTimeout = mempty
            , pncTimeWaitTimeout = mempty
            , pncChainSyncIdleTimeout = mempty
@@ -206,24 +195,6 @@ parseConfigFile =
     <> completer (bashCompleter "file")
     )
 
-parseMempoolCapacityOverride :: Parser MempoolCapacityBytesOverride
-parseMempoolCapacityOverride = parseOverride <|> parseNoOverride
-  where
-    parseOverride :: Parser MempoolCapacityBytesOverride
-    parseOverride =
-      MempoolCapacityBytesOverride . MempoolCapacityBytes <$>
-      Opt.option (auto @Word32)
-        (  long "mempool-capacity-override"
-        <> metavar "BYTES"
-        <> help "The number of bytes"
-        )
-    parseNoOverride :: Parser MempoolCapacityBytesOverride
-    parseNoOverride =
-      flag' NoMempoolCapacityBytesOverride
-        (  long "no-mempool-capacity-override"
-        <> help "The port number"
-        )
-
 parseDbPath :: Parser FilePath
 parseDbPath =
   strOption
@@ -330,25 +301,6 @@ parseStartAsNonProducingNode =
         ]
     ]
 
-parseNumOfDiskSnapshots :: Parser NumOfDiskSnapshots
-parseNumOfDiskSnapshots = fmap RequestedNumOfDiskSnapshots parseNum
-  where
-  parseNum = Opt.option auto
-    ( long "num-of-disk-snapshots"
-        <> metavar "NUMOFDISKSNAPSHOTS"
-        <> help "Number of ledger snapshots stored on disk."
-    )
-
--- TODO revisit because it sucks
-parseSnapshotInterval :: Parser SnapshotInterval
-parseSnapshotInterval = fmap (RequestedSnapshotInterval . secondsToDiffTime) parseDifftime
-  where
-  parseDifftime = Opt.option auto
-    ( long "snapshot-interval"
-        <> metavar "SNAPSHOTINTERVAL"
-        <> help "Snapshot Interval (in seconds)"
-    )
-
 -- | Produce just the brief help header for a given CLI option parser,
 --   without the options.
 parserHelpHeader :: String -> Opt.Parser a -> OptI.Doc

diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs
@@ -422,7 +422,7 @@ instance ( LogFormatting (Header blk)
       "Added request to queue to reprocess blocks postponed by LoE."
   forHuman ChainDB.PoppedReprocessLoEBlocksFromQueue =
       "Poppped request from queue to reprocess blocks postponed by LoE."
-  forHuman (ChainDB.ChainSelectionLoEDebug {}) =
+  forHuman ChainDB.ChainSelectionLoEDebug{} =
       "ChainDB LoE debug event"
   forMachine dtal (ChainDB.IgnoreBlockOlderThanK pt) =
       mconcat [ "kind" .= String "IgnoreBlockOlderThanK"