From 1caba26f22c080116f9e785fbfce50c39bc252ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Go=C5=9Blinowski?= Date: Mon, 23 Sep 2024 21:24:28 +0200 Subject: [PATCH] Remove redundant ScriptHash in ReferenceScript datatypes --- cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs | 4 ++-- cardano-api/internal/Cardano/Api/Script.hs | 13 ++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs index 61a8bcab6..769e5e854 100644 --- a/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs +++ b/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs @@ -1184,13 +1184,13 @@ genScriptWitnessForStake sbe = do SimpleScript simpleScript -> do simpleScriptOrReferenceInput <- Gen.choice [ pure $ SScript simpleScript - , SReferenceScript <$> genTxIn <*> Gen.maybe genScriptHash + , SReferenceScript <$> genTxIn ] pure $ Api.SimpleScriptWitness scriptLangInEra simpleScriptOrReferenceInput PlutusScript plutusScriptVersion' plutusScript -> do plutusScriptOrReferenceInput <- Gen.choice [ pure $ PScript plutusScript - , PReferenceScript <$> genTxIn <*> Gen.maybe genScriptHash + , PReferenceScript <$> genTxIn ] scriptRedeemer <- genHashableScriptData PlutusScriptWitness diff --git a/cardano-api/internal/Cardano/Api/Script.hs b/cardano-api/internal/Cardano/Api/Script.hs index 44a602575..0125dd4eb 100644 --- a/cardano-api/internal/Cardano/Api/Script.hs +++ b/cardano-api/internal/Cardano/Api/Script.hs @@ -681,17 +681,12 @@ data WitCtx witctx where -- or to mint tokens. This datatype encapsulates this concept. data PlutusScriptOrReferenceInput lang = PScript (PlutusScript lang) - | -- | Needed to construct the redeemer pointer map - -- in the case of minting reference scripts where we don't - -- have direct access to the script - PReferenceScript - TxIn - (Maybe ScriptHash) + | PReferenceScript TxIn deriving (Eq, Show) data SimpleScriptOrReferenceInput lang = SScript SimpleScript - | SReferenceScript TxIn (Maybe ScriptHash) + | SReferenceScript TxIn deriving (Eq, Show) -- | A /use/ of a script within a transaction body to witness that something is @@ -791,9 +786,9 @@ scriptWitnessScript (SimpleScriptWitness SimpleScriptInConway (SScript script)) Just $ ScriptInEra SimpleScriptInConway (SimpleScript script) scriptWitnessScript (PlutusScriptWitness langInEra version (PScript script) _ _ _) = Just $ ScriptInEra langInEra (PlutusScript version script) -scriptWitnessScript (SimpleScriptWitness _ (SReferenceScript _ _)) = +scriptWitnessScript (SimpleScriptWitness _ (SReferenceScript _)) = Nothing -scriptWitnessScript (PlutusScriptWitness _ _ (PReferenceScript _ _) _ _ _) = +scriptWitnessScript (PlutusScriptWitness _ _ (PReferenceScript _) _ _ _) = Nothing -- ----------------------------------------------------------------------------