From a90dc81867be73ec305094a5fd37bb3eee608182 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Fri, 10 Nov 2023 14:32:33 -0400 Subject: [PATCH] Propagate removal of ByronOnlyEra era from ... --- cardano-cli/src/Cardano/CLI/Byron/Parsers.hs | 2 +- cardano-cli/src/Cardano/CLI/Byron/Tx.hs | 2 +- cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs | 2 +- cardano-cli/src/Cardano/CLI/Json/Friendly.hs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs b/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs index ff6b1250f1..135180b0e5 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs @@ -293,7 +293,7 @@ parseTxOut = pLovelaceTxOut l = if l > (maxBound :: Word64) then error $ show l <> " lovelace exceeds the Word64 upper bound" - else TxOutValueByron ByronEraOnlyByron . Lovelace $ toInteger l + else TxOutValueByron . Lovelace $ toInteger l readerFromAttoParser :: Atto.Parser a -> Opt.ReadM a readerFromAttoParser p = diff --git a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs index a70be26fdf..615975dece 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs @@ -244,7 +244,7 @@ nodeSubmitTx nodeSocketPath network gentx = do localNodeNetworkId = network, localConsensusModeParams = CardanoModeParams (EpochSlots 21600) } - res <- liftIO $ submitTxToNodeLocal connctInfo (TxInByronSpecial ByronEraOnlyByron gentx) + res <- liftIO $ submitTxToNodeLocal connctInfo (TxInByronSpecial gentx) case res of Net.Tx.SubmitSuccess -> liftIO $ Text.putStrLn "Transaction successfully submitted." Net.Tx.SubmitFail reason -> diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs index 4c14bd71a0..5f03b1177f 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs @@ -1050,7 +1050,7 @@ printUtxo sbe txInOutTuple = printableValue :: TxOutValue era -> Text printableValue = \case - TxOutValueByron _ (Lovelace i) -> Text.pack $ show i + TxOutValueByron (Lovelace i) -> Text.pack $ show i TxOutValueShelleyBased sbe2 val -> renderValue $ Api.fromLedgerValue sbe2 val runQueryStakePoolsCmd :: () diff --git a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs index 9f14a99723..338fc0e7ad 100644 --- a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs +++ b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs @@ -566,7 +566,7 @@ friendlyMintValue = \case friendlyTxOutValue :: TxOutValue era -> Aeson.Value friendlyTxOutValue = \case - TxOutValueByron _ lovelace -> friendlyLovelace $ toShelleyLovelace lovelace + TxOutValueByron lovelace -> friendlyLovelace $ toShelleyLovelace lovelace TxOutValueShelleyBased sbe v -> friendlyLedgerValue sbe v friendlyLedgerValue :: ()