Update error message for incorrectly witnessed collateral inputs

IntersectMBO · Sep 27, 2022 · de3f8bf · de3f8bf
1 parent 0f61c86
commit de3f8bf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs
@@ -694,7 +694,7 @@ module Cardano.Api (
     getIsCardanoEraConstraint,
 
     -- ** Misc
-    NotScriptLockedTxInsError(..),
+    ScriptLockedTxInsError(..),
     TxInsExistError(..),
     renderNotScriptLockedTxInsError,
     renderTxInsExistError,

diff --git a/cardano-api/src/Cardano/Api/Convenience/Construction.hs b/cardano-api/src/Cardano/Api/Convenience/Construction.hs
@@ -5,7 +5,7 @@ module Cardano.Api.Convenience.Construction (
 
     -- * Misc
     TxInsExistError(..),
-    NotScriptLockedTxInsError(..),
+    ScriptLockedTxInsError(..),
     notScriptLockedTxIns,
     renderNotScriptLockedTxInsError,
     renderTxInsExistError,
@@ -84,19 +84,21 @@ txInsExistInUTxO ins (UTxO utxo)
       then return ()
       else Left . TxInsDoNotExist $ ins List.\\ occursInUtxo
 
-newtype NotScriptLockedTxInsError = NotScriptLockedTxIns [TxIn]
+newtype ScriptLockedTxInsError = ScriptLockedTxIns [TxIn]
 
-renderNotScriptLockedTxInsError :: NotScriptLockedTxInsError -> Text
-renderNotScriptLockedTxInsError (NotScriptLockedTxIns txins) =
-  "The followings tx inputs are not script locked: " <> textShow (map renderTxIn txins)
+-- Fix script locked error
+renderNotScriptLockedTxInsError :: ScriptLockedTxInsError -> Text
+renderNotScriptLockedTxInsError (ScriptLockedTxIns txins) =
+  "The followings tx inputs were expected to be key witnessed but are actually script witnessed: " <>
+  textShow (map renderTxIn txins)
 
-notScriptLockedTxIns :: [TxIn] -> UTxO era -> Either NotScriptLockedTxInsError ()
+notScriptLockedTxIns :: [TxIn] -> UTxO era -> Either ScriptLockedTxInsError ()
 notScriptLockedTxIns collTxIns (UTxO utxo) = do
   let onlyCollateralUTxOs = Map.restrictKeys utxo $ Set.fromList collTxIns
       scriptLockedTxIns =
         filter (\(_, TxOut aInEra _ _ _) -> not $ isKeyAddress aInEra ) $ Map.assocs onlyCollateralUTxOs
   if null scriptLockedTxIns
   then return ()
-  else Left . NotScriptLockedTxIns $ map fst scriptLockedTxIns
+  else Left . ScriptLockedTxIns $ map fst scriptLockedTxIns
 
 
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
@@ -110,7 +110,7 @@ data ShelleyTxCmdError
   | ShelleyTxCmdPParamExecutionUnitsNotAvailable
   | ShelleyTxCmdTxEraCastErr EraCastError
   | ShelleyTxCmdQueryConvenienceError !QueryConvenienceError
-  | ShelleyTxCmdQueryNotScriptLocked !NotScriptLockedTxInsError
+  | ShelleyTxCmdQueryNotScriptLocked !ScriptLockedTxInsError
 
 renderShelleyTxCmdError :: ShelleyTxCmdError -> Text
 renderShelleyTxCmdError err =