Fix for #4924 bug that

was introduced by #4886 readScriptDataOrFile was reverted to read ScriptData json with the detailed schema format (ScriptDataJsonDetailedSchema)
IntersectMBO · Mar 6, 2023 · 0d23909 · 0d23909
1 parent 20c23d1
commit 0d23909
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)