Merge pull request #404 from input-output-hk/newhoggy/remove-shelley-…

…mode-and-byron-mode

Remove `ShelleyMode` and `ByronMode`

cardano-cli/cardano-cli.cabal

@@ -62,7 +62,6 @@ library
                         Cardano.CLI.Byron.Key
                         Cardano.CLI.Byron.Legacy
                         Cardano.CLI.Byron.Parsers
-                        Cardano.CLI.Byron.Query
                         Cardano.CLI.Byron.Run
                         Cardano.CLI.Byron.Tx
                         Cardano.CLI.Byron.UpdateProposal

cardano-cli/src/Cardano/CLI/Byron/Commands.hs

@@ -60,10 +60,6 @@ data ByronCommand =
         NetworkId
         (SigningKeyFile In)
 
-  | GetLocalNodeTip
-        SocketPath
-        NetworkId
-
     -----------------------------------
 
   | SubmitTx

cardano-cli/src/Cardano/CLI/Byron/Parsers.hs

@@ -83,7 +83,6 @@ backwardsCompatibilityCommands envCli =
           [ parseGenesisRelatedValues
           , parseKeyRelatedValues envCli
           , parseTxRelatedValues envCli
-          , return (parseLocalNodeQueryValues envCli)
           , parseMiscellaneous
           ]
 
@@ -95,8 +94,6 @@ parseByronCommands envCli = asum
       $ Opt.progDesc "Byron key utility commands")
   , subParser' "transaction" (Opt.info (asum $ map Opt.subparser (parseTxRelatedValues envCli))
       $ Opt.progDesc "Byron transaction commands")
-  , subParser' "query" (Opt.info (Opt.subparser (parseLocalNodeQueryValues envCli))
-      $ Opt.progDesc "Byron node query commands.")
   , subParser' "genesis" (Opt.info (asum $ map Opt.subparser parseGenesisRelatedValues)
       $ Opt.progDesc "Byron genesis block commands")
   , subParser' "governance" (Opt.info (NodeCmds <$> Opt.subparser (pNodeCmds envCli))
@@ -218,14 +215,6 @@ parseKeyRelatedValues envCli =
             <*> parseNewSigningKeyFile "to"
     ]
 
-parseLocalNodeQueryValues :: EnvCli -> Mod CommandFields ByronCommand
-parseLocalNodeQueryValues envCli =
-  command' "get-tip" "Get the tip of your local node's blockchain"
-    $ GetLocalNodeTip
-        <$> pSocketPath envCli
-        <*> pNetworkId envCli
-
-
 parseMiscellaneous :: [Mod CommandFields ByronCommand]
 parseMiscellaneous =
   [ command'
@@ -241,8 +230,6 @@ parseMiscellaneous =
           <$> parseFilePath "filepath" "Filepath of CBOR file."
   ]
 
-
-
 parseTestnetBalanceOptions :: Parser TestnetBalanceOptions
 parseTestnetBalanceOptions =
   TestnetBalanceOptions

cardano-cli/src/Cardano/CLI/Byron/Run.hs

@@ -15,7 +15,6 @@ import           Cardano.CLI.Byron.Commands
 import           Cardano.CLI.Byron.Delegation
 import           Cardano.CLI.Byron.Genesis
 import           Cardano.CLI.Byron.Key
-import           Cardano.CLI.Byron.Query
 import           Cardano.CLI.Byron.Tx
 import           Cardano.CLI.Byron.UpdateProposal
 import           Cardano.CLI.Byron.Vote
@@ -63,7 +62,6 @@ runByronClientCommand c =
   case c of
     NodeCmds bc -> runNodeCmds bc
     Genesis outDir params -> runGenesisCommand outDir params
-    GetLocalNodeTip mNodeSocketPath network -> liftIO $ runGetLocalNodeTip mNodeSocketPath network
     ValidateCBOR cborObject fp -> runValidateCBOR cborObject fp
     PrettyPrintCBOR fp -> runPrettyPrintCBOR fp
     PrettySigningKeyPublic bKeyFormat skF -> runPrettySigningKeyPublic bKeyFormat skF

cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs

@@ -61,7 +61,7 @@ data QueryCmds era
 
 data QueryLeadershipScheduleCmdArgs = QueryLeadershipScheduleCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , genesisFp           :: !GenesisFile
   , poolColdVerKeyFile  :: !(VerificationKeyOrHashOrFile StakePoolKey)
@@ -72,95 +72,95 @@ data QueryLeadershipScheduleCmdArgs = QueryLeadershipScheduleCmdArgs
 
 data QueryProtocolParametersCmdArgs = QueryProtocolParametersCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryConstitutionHashCmdArgs = QueryConstitutionHashCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryTipCmdArgs = QueryTipCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryStakePoolsCmdArgs = QueryStakePoolsCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryStakeDistributionCmdArgs = QueryStakeDistributionCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryStakeAddressInfoCmdArgs = QueryStakeAddressInfoCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , addr                :: !StakeAddress
   , networkId           :: !NetworkId
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryUTxOCmdArgs = QueryUTxOCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , queryFilter         :: !QueryUTxOFilter
   , networkId           :: !NetworkId
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryLedgerStateCmdArgs = QueryLedgerStateCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryProtocolStateCmdArgs = QueryProtocolStateCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryStakeSnapshotCmdArgs = QueryStakeSnapshotCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , allOrOnlyPoolIds    :: !(AllOrOnly [Hash StakePoolKey])
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryKesPeriodInfoCmdArgs = QueryKesPeriodInfoCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , nodeOpCertFp        :: !(File () In) -- ^ Node operational certificate
   , mOutFile            :: !(Maybe (File () Out))
   } deriving (Generic, Show)
 
 data QueryPoolStateCmdArgs = QueryPoolStateCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , poolIds             :: ![Hash StakePoolKey]
   } deriving (Generic, Show)
 
 data QueryTxMempoolCmdArgs = QueryTxMempoolCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , query               :: !TxMempoolQuery
   , mOutFile            :: !(Maybe (File () Out))
@@ -169,23 +169,23 @@ data QueryTxMempoolCmdArgs = QueryTxMempoolCmdArgs
 
 data QuerySlotNumberCmdArgs = QuerySlotNumberCmdArgs
   { nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , utcTime             :: !UTCTime
   } deriving (Generic, Show)
 
 data QueryNoArgCmdArgs era = QueryNoArgCmdArgs
   { eon                 :: !(ConwayEraOnwards era)
   , nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , mOutFile            :: !(Maybe (File () Out))
   } deriving Show
 
 data QueryDRepStateCmdArgs era = QueryDRepStateCmdArgs
   { eon                 :: !(ConwayEraOnwards era)
   , nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , drepKeys            :: ![VerificationKeyOrHashOrFile DRepKey]
   , mOutFile            :: !(Maybe (File () Out))
@@ -194,7 +194,7 @@ data QueryDRepStateCmdArgs era = QueryDRepStateCmdArgs
 data QueryDRepStakeDistributionCmdArgs era = QueryDRepStakeDistributionCmdArgs
   { eon                 :: !(ConwayEraOnwards era)
   , nodeSocketPath      :: !SocketPath
-  , consensusModeParams :: !AnyConsensusModeParams
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
   , networkId           :: !NetworkId
   , drepKeys            :: ![VerificationKeyOrHashOrFile DRepKey]
   , mOutFile            :: !(Maybe (File () Out))
@@ -203,7 +203,7 @@ data QueryDRepStakeDistributionCmdArgs era = QueryDRepStakeDistributionCmdArgs
 data QueryCommitteeMembersStateCmdArgs era = QueryCommitteeMembersStateCmdArgs
   { eon                     :: !(ConwayEraOnwards era)
   , nodeSocketPath          :: !SocketPath
-  , consensusModeParams     :: !AnyConsensusModeParams
+  , consensusModeParams     :: !(ConsensusModeParams CardanoMode)
   , networkId               :: !NetworkId
   , committeeColdKeys       :: ![VerificationKeyOrHashOrFile CommitteeColdKey]
   , committeeHotKeys        :: ![VerificationKeyOrHashOrFile CommitteeHotKey]

cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs

@@ -84,7 +84,7 @@ data TransactionBuildRawCmdArgs era = TransactionBuildRawCmdArgs
 data TransactionBuildCmdArgs era = TransactionBuildCmdArgs
   { eon                     :: !(ShelleyBasedEra era)
   , nodeSocketPath          :: !SocketPath
-  , consensusModeParams     :: !AnyConsensusModeParams
+  , consensusModeParams     :: !(ConsensusModeParams CardanoMode)
   , networkId               :: !NetworkId
   , mScriptValidity         :: !(Maybe ScriptValidity)
     -- ^ Mark script as expected to pass or fail validation
@@ -147,10 +147,10 @@ data TransactionSignWitnessCmdArgs = TransactionSignWitnessCmdArgs
   } deriving Show
 
 data TransactionSubmitCmdArgs = TransactionSubmitCmdArgs
-  { nodeSocketPath          :: !SocketPath
-  , anyConsensusModeParams  :: !AnyConsensusModeParams
-  , networkId               :: !NetworkId
-  , txFile                  :: !FilePath
+  { nodeSocketPath      :: !SocketPath
+  , consensusModeParams :: !(ConsensusModeParams CardanoMode)
+  , networkId           :: !NetworkId
+  , txFile              :: !FilePath
   } deriving Show
 
 newtype TransactionPolicyIdCmdArgs = TransactionPolicyIdCmdArgs

cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs

@@ -109,47 +109,25 @@ toUnitIntervalOrErr r = case Ledger.boundRational r of
                                            ]
                          Just n -> n
 
-pConsensusModeParams :: Parser AnyConsensusModeParams
+pConsensusModeParams :: Parser (ConsensusModeParams CardanoMode)
 pConsensusModeParams = asum
-  [ pShelleyMode *> pShelleyConsensusMode
-  , pByronMode *> pByronConsensusMode
-  , pCardanoMode *> pCardanoConsensusMode
+  [ pCardanoMode *> pCardanoConsensusMode
   , pDefaultConsensusMode
   ]
   where
-    pShelleyMode :: Parser ()
-    pShelleyMode =
-      Opt.flag' () $ mconcat
-        [ Opt.long "shelley-mode"
-        , Opt.help "For talking to a node running in Shelley-only mode."
-        ]
-
-    pByronMode :: Parser ()
-    pByronMode =
-      Opt.flag' () $ mconcat
-        [ Opt.long "byron-mode"
-        , Opt.help "For talking to a node running in Byron-only mode."
-        ]
-
     pCardanoMode :: Parser ()
     pCardanoMode =
       Opt.flag' () $ mconcat
         [ Opt.long "cardano-mode"
         , Opt.help "For talking to a node running in full Cardano mode (default)."
         ]
 
-    pCardanoConsensusMode :: Parser AnyConsensusModeParams
-    pCardanoConsensusMode = AnyConsensusModeParams . CardanoModeParams <$> pEpochSlots
-
-    pByronConsensusMode :: Parser AnyConsensusModeParams
-    pByronConsensusMode = AnyConsensusModeParams . ByronModeParams <$> pEpochSlots
-
-    pShelleyConsensusMode :: Parser AnyConsensusModeParams
-    pShelleyConsensusMode = pure (AnyConsensusModeParams ShelleyModeParams)
+    pCardanoConsensusMode :: Parser (ConsensusModeParams CardanoMode)
+    pCardanoConsensusMode = CardanoModeParams <$> pEpochSlots
 
-    pDefaultConsensusMode :: Parser AnyConsensusModeParams
+    pDefaultConsensusMode :: Parser (ConsensusModeParams CardanoMode)
     pDefaultConsensusMode =
-      pure . AnyConsensusModeParams . CardanoModeParams $ EpochSlots defaultByronEpochSlots
+      pure . CardanoModeParams $ EpochSlots defaultByronEpochSlots
 
 defaultByronEpochSlots :: Word64
 defaultByronEpochSlots = 21600