Merge pull request #605 from IntersectMBO/mkoura/cli_format_unsupported

Fix error messages as CLI format is no longer supported
IntersectMBO · Feb 12, 2024 · 7e457f7 · 7e457f7
2 parents 66216d0 + 1c650e9
commit 7e457f7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -24,7 +24,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2024-02-06-1"
+      CABAL_CACHE_VERSION: "2024-02-12-1"
 
     concurrency:
       group: >

diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs
@@ -521,8 +521,8 @@ data CddlError = CddlErrorTextEnv
 instance Error CddlError where
   prettyError = \case
     CddlErrorTextEnv textEnvErr cddlErr ->
-      "Failed to decode neither the cli's serialisation format nor the ledger's " <>
-      "CDDL serialisation format. TextEnvelope error: " <> prettyError textEnvErr <> "\n" <>
+      "Failed to decode the ledger's CDDL serialisation format. " <>
+      "TextEnvelope error: " <> prettyError textEnvErr <> "\n" <>
       "TextEnvelopeCddl error: " <> prettyError cddlErr
     CddlIOError e ->
       prettyError e
@@ -584,9 +584,8 @@ data CddlWitnessError
 instance Error CddlWitnessError where
   prettyError = \case
     CddlWitnessErrorTextEnv teErr cddlErr ->
-      "Failed to decode neither the cli's serialisation format nor the ledger's \
-      \CDDL serialisation format. TextEnvelope error: " <> prettyError teErr <> "\n" <>
-      "TextEnvelopeCddl error: " <> prettyError cddlErr
+      "Failed to decode the ledger's CDDL serialisation format. TextEnvelope error: " <>
+      prettyError teErr <> "\n" <> "TextEnvelopeCddl error: " <> prettyError cddlErr
     CddlWitnessIOError fileE ->
       prettyError fileE
 

diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs
@@ -168,8 +168,8 @@ renderTxCmdError = \case
     prettyError err'
   TxCmdTextEnvCddlError textEnvErr cddlErr ->
     mconcat
-    [ "Failed to decode neither the cli's serialisation format nor the ledger's "
-    , "CDDL serialisation format. TextEnvelope error: " <> prettyError textEnvErr <> "\n"
+    [ "Failed to decode the ledger's CDDL serialisation format. "
+    , "TextEnvelope error: " <> prettyError textEnvErr <> "\n"
     , "TextEnvelopeCddl error: " <> prettyError cddlErr
     ]
   TxCmdTxExecUnitsErr (AnyTxCmdTxExecUnitsErr err') ->

diff --git a/...Cardano.CLI.Types.Errors.GovernanceCmdError.GovernanceCmdError/GovernanceCmdCddlError.txt b/...Cardano.CLI.Types.Errors.GovernanceCmdError.GovernanceCmdError/GovernanceCmdCddlError.txt
@@ -1,2 +1,2 @@
-Reading transaction CDDL file error: Failed to decode neither the cli's serialisation format nor the ledger's CDDL serialisation format. TextEnvelope error: path/file.txt: TextEnvelope decode error: DecoderErrorCustom "todecode" "decodeerr"
-TextEnvelopeCddl error: path/file.txt: Unknown key witness specified
+Reading transaction CDDL file error: Failed to decode the ledger's CDDL serialisation format. TextEnvelope error: path/file.txt: TextEnvelope decode error: DecoderErrorCustom "todecode" "decodeerr"
+TextEnvelopeCddl error: path/file.txt: Unknown key witness specified