Implement query protocol state in cardano-cli using the new api

IntersectMBO · Jan 28, 2021 · da28b27 · da28b27
1 parent e18b2d9
commit da28b27
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 159 deletions.
diff --git a/cardano-api/src/Cardano/Api/TxBody.hs b/cardano-api/src/Cardano/Api/TxBody.hs
@@ -236,7 +236,7 @@ data TxIn = TxIn TxId TxIx
 
 deriving instance ToJSON TxIn
 instance ToJSONKey TxIn where
-  toJSONKey = toJSONKeyText (\txIn -> Text.pack $ show txIn)
+  toJSONKey = toJSONKeyText (Text.pack . show)
 
 newtype TxIx = TxIx Word
   deriving stock (Eq, Ord, Show)

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs b/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs
@@ -50,7 +50,6 @@ import           Prelude
 
 import           Cardano.Api
 import           Cardano.Api.Modes
-import           Cardano.Api.Protocol (Protocol)
 import           Cardano.Api.Shelley hiding (PoolId)
 
 import           Ouroboros.Consensus.BlockchainTime (SystemStart (..))
@@ -278,7 +277,7 @@ data QueryCmd =
   | QueryStakeAddressInfo AnyCardanoEra AnyConsensusModeParams StakeAddress NetworkId (Maybe OutputFile)
   | QueryUTxO AnyCardanoEra AnyConsensusModeParams QueryFilter NetworkId (Maybe OutputFile)
   | QueryLedgerState AnyCardanoEra AnyConsensusModeParams NetworkId (Maybe OutputFile)
-  | QueryProtocolState AnyCardanoEra Protocol NetworkId (Maybe OutputFile)
+  | QueryProtocolState AnyCardanoEra AnyConsensusModeParams NetworkId (Maybe OutputFile)
   deriving Show
 
 renderQueryCmd :: QueryCmd -> Text

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
@@ -18,7 +18,6 @@ import           Prelude (String)
 
 import           Cardano.Api
 import           Cardano.Api.Modes
-import           Cardano.Api.Protocol (Protocol (..))
 import           Cardano.Api.Shelley
 
 import           Cardano.Chain.Slotting (EpochSlots (..))
@@ -709,7 +708,7 @@ pQueryCmd =
     pQueryProtocolState :: Parser QueryCmd
     pQueryProtocolState = QueryProtocolState
                             <$> pCardanoEra
-                            <*> pProtocol
+                            <*> pConsensusModeParams
                             <*> pNetworkId
                             <*> pMaybeOutputFile
 
@@ -2303,43 +2302,6 @@ pConsensusModeParams = asum
    pByronConsensusMode :: Parser AnyConsensusModeParams
    pByronConsensusMode = AnyConsensusModeParams . ByronModeParams <$> pEpochSlots
 
-pProtocol :: Parser Protocol
-pProtocol =
-    (  Opt.flag' ()
-        (  Opt.long "shelley-mode"
-        <> Opt.help "For talking to a node running in Shelley-only mode."
-        )
-    *> pShelleyMode
-    )
-  <|>
-    (  Opt.flag' ()
-        (  Opt.long "byron-mode"
-        <> Opt.help "For talking to a node running in Byron-only mode."
-        )
-    *> pByronMode
-    )
-  <|>
-    (  Opt.flag' ()
-        (  Opt.long "cardano-mode"
-        <> Opt.help "For talking to a node running in full Cardano mode (default)."
-        )
-    *> pCardanoMode
-    )
-  <|>
-    -- Default to the Cardano protocol.
-    pure
-      (CardanoProtocol
-        (EpochSlots defaultByronEpochSlots))
-  where
-    pByronMode :: Parser Protocol
-    pByronMode = ByronProtocol <$> pEpochSlots
-
-    pShelleyMode :: Parser Protocol
-    pShelleyMode = pure ShelleyProtocol
-
-    pCardanoMode :: Parser Protocol
-    pCardanoMode = CardanoProtocol <$> pEpochSlots
-
 defaultByronEpochSlots :: Word64
 defaultByronEpochSlots = 21600