Remove Shelley and Byron operation modes in cardano tools

Author: jasagredo

ouroboros-consensus-cardano/app/DBAnalyser/Parsers.hs

@@ -2,29 +2,25 @@
 {-# LANGUAGE LambdaCase #-}
 
 module DBAnalyser.Parsers
-  ( BlockType (..)
-  , blockTypeParser
-  , parseCmdLine
+  ( parseCmdLine
+  , parseCardanoArgs
+  , CardanoBlockArgs
   ) where
 
-import Cardano.Crypto (RequiresNetworkMagic (..))
 import Cardano.Tools.DBAnalyser.Analysis
-import Cardano.Tools.DBAnalyser.Block.Byron
 import Cardano.Tools.DBAnalyser.Block.Cardano
-import Cardano.Tools.DBAnalyser.Block.Shelley
 import Cardano.Tools.DBAnalyser.Types
 import qualified Data.Foldable as Foldable
 import Options.Applicative
 import Ouroboros.Consensus.Block (SlotNo (..), WithOrigin (..))
 import Ouroboros.Consensus.Byron.Node (PBftSignatureThreshold (..))
-import Ouroboros.Consensus.Shelley.Node (Nonce (..))
 
 {-------------------------------------------------------------------------------
   Parsing
 -------------------------------------------------------------------------------}
 
-parseCmdLine :: Parser (DBAnalyserConfig, BlockType)
-parseCmdLine = (,) <$> parseDBAnalyserConfig <*> blockTypeParser
+parseCmdLine :: Parser (DBAnalyserConfig, CardanoBlockArgs)
+parseCmdLine = (,) <$> parseDBAnalyserConfig <*> parseCardanoArgs
 
 parseDBAnalyserConfig :: Parser DBAnalyserConfig
 parseDBAnalyserConfig =
@@ -259,65 +255,12 @@ pMaybeOutputFile =
   Parse BlockType-specific arguments
 -------------------------------------------------------------------------------}
 
-data BlockType
-  = ByronBlock ByronBlockArgs
-  | ShelleyBlock ShelleyBlockArgs
-  | CardanoBlock CardanoBlockArgs
-
-blockTypeParser :: Parser BlockType
-blockTypeParser =
-  subparser $
-    mconcat
-      [ command
-          "byron"
-          (info (parseByronType <**> helper) (progDesc "Analyse a Byron-only DB"))
-      , command
-          "shelley"
-          (info (parseShelleyType <**> helper) (progDesc "Analyse a Shelley-only DB"))
-      , command
-          "cardano"
-          (info (parseCardanoType <**> helper) (progDesc "Analyse a Cardano DB"))
-      ]
-
-parseByronType :: Parser BlockType
-parseByronType = ByronBlock <$> parseByronArgs
-
-parseShelleyType :: Parser BlockType
-parseShelleyType = ShelleyBlock <$> parseShelleyArgs
-
-parseCardanoType :: Parser BlockType
-parseCardanoType = CardanoBlock <$> parseCardanoArgs
-
 parseCardanoArgs :: Parser CardanoBlockArgs
 parseCardanoArgs =
   CardanoBlockArgs
     <$> parseConfigFile
     <*> parsePBftSignatureThreshold
 
-parseShelleyArgs :: Parser ShelleyBlockArgs
-parseShelleyArgs =
-  ShelleyBlockArgs
-    <$> strOption
-      ( mconcat
-          [ long "configShelley"
-          , help "Path to config file"
-          , metavar "PATH"
-          ]
-      )
-    <*> Foldable.asum
-      [ Nonce <$> parseNonce
-      , pure NeutralNonce
-      ]
- where
-  parseNonce =
-    strOption
-      ( mconcat
-          [ long "nonce"
-          , help "Initial nonce, i.e., hash of the genesis config file"
-          , metavar "NONCE"
-          ]
-      )
-
 parseConfigFile :: Parser FilePath
 parseConfigFile =
   strOption $
@@ -337,27 +280,3 @@ parsePBftSignatureThreshold =
           , help "PBftSignatureThreshold"
           , metavar "THRESHOLD"
           ]
-
-parseByronArgs :: Parser ByronBlockArgs
-parseByronArgs =
-  ByronBlockArgs
-    <$> parseConfigFile
-    <*> flag
-      RequiresNoMagic
-      RequiresMagic
-      ( mconcat
-          [ long "requires-magic"
-          , help "The DB contains blocks from a testnet, requiring network magic, rather than mainnet"
-          ]
-      )
-    <*> optional
-      ( option
-          auto
-          ( mconcat
-              [ long "genesisHash"
-              , help "Expected genesis hash"
-              , metavar "HASH"
-              ]
-          )
-      )
-    <*> parsePBftSignatureThreshold

ouroboros-consensus-cardano/app/DBTruncater/Parsers.hs

@@ -5,8 +5,8 @@ import DBAnalyser.Parsers
 import Options.Applicative
 import Ouroboros.Consensus.Block.Abstract
 
-commandLineParser :: Parser (DBTruncaterConfig, BlockType)
-commandLineParser = (,) <$> parseDBTruncaterConfig <*> blockTypeParser
+commandLineParser :: Parser (DBTruncaterConfig, CardanoBlockArgs)
+commandLineParser = (,) <$> parseDBTruncaterConfig <*> parseCardanoArgs
 
 parseDBTruncaterConfig :: Parser DBTruncaterConfig
 parseDBTruncaterConfig =
@@ -23,6 +23,7 @@ parseDBTruncaterConfig =
         , metavar "PATH"
         ]
   parseVerbose = switch (long "verbose" <> help "Enable verbose logging")
+
 parseTruncateAfter :: Parser TruncateAfter
 parseTruncateAfter =
   fmap TruncateAfterSlot slotNoOption <|> fmap TruncateAfterBlock blockNoOption

ouroboros-consensus-cardano/app/db-analyser.hs

@@ -18,6 +18,7 @@
 module Main (main) where
 
 import Cardano.Crypto.Init (cryptoInit)
+import Cardano.Tools.DBAnalyser.Block.Cardano
 import Cardano.Tools.DBAnalyser.Run
 import Cardano.Tools.DBAnalyser.Types
 import Cardano.Tools.GitRev (gitRev)
@@ -38,13 +39,9 @@ import Options.Applicative
 main :: IO ()
 main = withStdTerminalHandles $ do
   cryptoInit
-  (conf, blocktype) <- getCmdLine
-  void $ case blocktype of
-    ByronBlock args -> analyse conf args
-    ShelleyBlock args -> analyse conf args
-    CardanoBlock args -> analyse conf args
+  void $ uncurry analyse =<< getCmdLine
 
-getCmdLine :: IO (DBAnalyserConfig, BlockType)
+getCmdLine :: IO (DBAnalyserConfig, CardanoBlockArgs)
 getCmdLine = execParser opts
  where
   opts =

ouroboros-consensus-cardano/app/db-truncater.hs

@@ -3,7 +3,7 @@ module Main (main) where
 import Cardano.Crypto.Init (cryptoInit)
 import Cardano.Tools.DBTruncater.Run
 import Cardano.Tools.DBTruncater.Types
-import DBAnalyser.Parsers (BlockType (..))
+import DBAnalyser.Parsers
 import qualified DBTruncater.Parsers as DBTruncater
 import Main.Utf8 (withStdTerminalHandles)
 import Options.Applicative
@@ -20,13 +20,9 @@ import Prelude hiding (truncate)
 main :: IO ()
 main = withStdTerminalHandles $ do
   cryptoInit
-  (conf, blocktype) <- getCommandLineConfig
-  case blocktype of
-    ByronBlock args -> truncate conf args
-    ShelleyBlock args -> truncate conf args
-    CardanoBlock args -> truncate conf args
+  uncurry truncate =<< getCommandLineConfig
 
-getCommandLineConfig :: IO (DBTruncaterConfig, BlockType)
+getCommandLineConfig :: IO (DBTruncaterConfig, CardanoBlockArgs)
 getCommandLineConfig = execParser opts
  where
   opts =

ouroboros-consensus-cardano/app/snapshot-converter.hs

@@ -66,11 +66,11 @@ data Config = Config
   -- ^ Path to the output snapshot
   }
 
-getCommandLineConfig :: IO (Config, BlockType)
+getCommandLineConfig :: IO (Config, CardanoBlockArgs)
 getCommandLineConfig =
   execParser $
     info
-      ((,) <$> parseConfig <*> blockTypeParser <**> helper)
+      ((,) <$> parseConfig <*> parseCardanoArgs <**> helper)
       (fullDesc <> progDesc "Utility for converting snapshots to and from UTxO-HD")
 
 parseConfig :: Parser Config
@@ -260,11 +260,7 @@ store _ _ _ _ = error "Malformed output path!"
 main :: IO ()
 main = withStdTerminalHandles $ do
   cryptoInit
-  (conf, blocktype) <- getCommandLineConfig
-  case blocktype of
-    ByronBlock args -> run conf args
-    ShelleyBlock args -> run conf args
-    CardanoBlock args -> run conf args
+  uncurry run =<< getCommandLineConfig
  where
   run conf args = do
     ccfg <- configCodec . pInfoConfig <$> mkProtocolInfo args

ouroboros-consensus-cardano/changelog.d/20250826_131450_javier.sagredo_remove_shelley_byron.md

@@ -0,0 +1,25 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+For top level release notes, leave all the headers commented out.
+-->
+
+<!--
+### Patch
+
+- A bullet item for the Patch category.
+
+-->
+<!--
+### Non-Breaking
+
+- A bullet item for the Non-Breaking category.
+
+-->
+<!--
+### Breaking
+
+- A bullet item for the Breaking category.
+
+-->

ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal

@@ -608,7 +608,6 @@ executable db-analyser
   build-depends:
     base,
     cardano-crypto-class,
-    cardano-crypto-wrapper,
     optparse-applicative,
     ouroboros-consensus,
     ouroboros-consensus-cardano:{ouroboros-consensus-cardano, unstable-cardano-tools},
@@ -666,7 +665,6 @@ executable db-truncater
   build-depends:
     base,
     cardano-crypto-class,
-    cardano-crypto-wrapper,
     optparse-applicative,
     ouroboros-consensus,
     ouroboros-consensus-cardano:{ouroboros-consensus-cardano, unstable-cardano-tools},
@@ -697,7 +695,6 @@ executable snapshot-converter
     base,
     bytestring,
     cardano-crypto-class,
-    cardano-crypto-wrapper,
     contra-tracer,
     filepath,
     fs-api,