From fc69901ed21a4391bc6c7e6ac228b5e598372d73 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 1 Mar 2023 09:09:04 -0400 Subject: [PATCH] Fix for https://github.com/input-output-hk/cardano-node/issues/4924 bug that was introduced by https://github.com/input-output-hk/cardano-node/pull/4886 readScriptDataOrFile was reverted to read ScriptData json with the detailed schema format (ScriptDataJsonDetailedSchema) --- cardano-api/src/Cardano/Api/ScriptData.hs | 4 ++-- cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cardano-api/src/Cardano/Api/ScriptData.hs b/cardano-api/src/Cardano/Api/ScriptData.hs index 0b898ec0749..a87dacd626f 100644 --- a/cardano-api/src/Cardano/Api/ScriptData.hs +++ b/cardano-api/src/Cardano/Api/ScriptData.hs @@ -490,9 +490,9 @@ data ScriptDataJsonBytesError instance Error ScriptDataJsonBytesError where displayError (ScriptDataJsonBytesErrorValue e) = - "Error decoding ScriptData JSON value: " <> show e + "Error decoding ScriptData JSON value: " <> displayError e displayError (ScriptDataJsonBytesErrorInvalid e) = - "ScriptData is invalid: " <> show e + "ScriptData is invalid: " <> displayError e -- | This allows us to take JSON formatted ScriptData and encode it in the CDDL format diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs index fb91b698cd3..b9b5c91ffcf 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs @@ -366,7 +366,7 @@ readScriptDataOrFile (ScriptDataJsonFile fp) = do sDataValue <- hoistEither . first (ScriptDataErrorJsonParse fp) $ Aeson.eitherDecode sDataBs hoistEither . first ScriptDataErrorJsonBytes - $ scriptDataJsonToHashable ScriptDataJsonNoSchema sDataValue + $ scriptDataJsonToHashable ScriptDataJsonDetailedSchema sDataValue readScriptDataOrFile (ScriptDataCborFile fp) = do origBs <- handleIOExceptT (ScriptDataErrorFile . FileIOError fp) (BS.readFile fp)