Remove ScriptDatumOrFile

IntersectMBO · Feb 6, 2025 · 7b20f90 · 7b20f90
1 parent 4ffd0e1
commit 7b20f90
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 75 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -1082,54 +1082,6 @@ pScriptRedeemerOrFile scriptFlagPrefix =
     "The script redeemer value."
     "The script redeemer file."
 
-pScriptDatumOrFileCip69 :: String -> WitCtx witctx -> Parser (ScriptDatumOrFile witctx)
-pScriptDatumOrFileCip69 scriptFlagPrefix witctx =
-  case witctx of
-    WitCtxTxIn ->
-      asum
-        [ ScriptDatumOrFileForTxIn
-            <$> optional
-              ( pScriptDataOrFile
-                  (scriptFlagPrefix ++ "-datum")
-                  "The script datum."
-                  "The script datum file."
-              )
-        , pInlineDatumPresent
-        ]
-    WitCtxMint -> pure NoScriptDatumOrFileForMint
-    WitCtxStake -> pure NoScriptDatumOrFileForStake
- where
-  pInlineDatumPresent :: Parser (ScriptDatumOrFile WitCtxTxIn)
-  pInlineDatumPresent =
-    flag' InlineDatumPresentAtTxIn $
-      mconcat
-        [ long (scriptFlagPrefix ++ "-inline-datum-present")
-        , Opt.help "Inline datum present at transaction input."
-        ]
-
-pScriptDatumOrFile :: String -> WitCtx witctx -> Parser (ScriptDatumOrFile witctx)
-pScriptDatumOrFile scriptFlagPrefix witctx =
-  case witctx of
-    WitCtxTxIn ->
-      asum
-        [ ScriptDatumOrFileForTxIn . Just
-            <$> pScriptDataOrFile
-              (scriptFlagPrefix ++ "-datum")
-              "The script datum."
-              "The script datum file."
-        , pInlineDatumPresent
-        ]
-    WitCtxMint -> pure NoScriptDatumOrFileForMint
-    WitCtxStake -> pure NoScriptDatumOrFileForStake
- where
-  pInlineDatumPresent :: Parser (ScriptDatumOrFile WitCtxTxIn)
-  pInlineDatumPresent =
-    flag' InlineDatumPresentAtTxIn $
-      mconcat
-        [ long (scriptFlagPrefix ++ "-inline-datum-present")
-        , Opt.help "Inline datum present at transaction input."
-        ]
-
 pScriptDatumOrFileSpendingCip69
   :: ShelleyBasedEra era -> String -> Parser PlutusSpend.ScriptDatumOrFileSpending
 pScriptDatumOrFileSpendingCip69 sbe scriptFlagPrefix =

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs
@@ -5,7 +5,6 @@
 module Cardano.CLI.EraBased.Script.Read.Common
   ( -- * Plutus Script Related
     readScriptDataOrFile
-  , readScriptDatumOrFile
   , readScriptRedeemerOrFile
   , readFilePlutusScript
 
@@ -130,17 +129,6 @@ readScriptDataOrFile (ScriptDataCborFile fp) = do
         getScriptData hSd
   return hSd
 
-readScriptDatumOrFile
-  :: ScriptDatumOrFile witctx
-  -> ExceptT ScriptDataError IO (ScriptDatum witctx)
-readScriptDatumOrFile (ScriptDatumOrFileForTxIn Nothing) = pure $ ScriptDatumForTxIn Nothing
-readScriptDatumOrFile (ScriptDatumOrFileForTxIn (Just df)) =
-  ScriptDatumForTxIn . Just
-    <$> readScriptDataOrFile df
-readScriptDatumOrFile InlineDatumPresentAtTxIn = pure InlineScriptDatum
-readScriptDatumOrFile NoScriptDatumOrFileForMint = pure NoScriptDatumForMint
-readScriptDatumOrFile NoScriptDatumOrFileForStake = pure NoScriptDatumForStake
-
 readScriptRedeemerOrFile
   :: ScriptRedeemerOrFile
   -> ExceptT ScriptDataError IO ScriptRedeemer

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs
@@ -8,8 +8,8 @@ module Cardano.CLI.EraBased.Script.Withdrawal.Read
 where
 
 import           Cardano.Api
-import           Cardano.Api.Shelley
 import           Cardano.Api.Ledger
+import           Cardano.Api.Shelley
 
 import           Cardano.CLI.EraBased.Script.Read.Common
 import           Cardano.CLI.EraBased.Script.Types
@@ -32,7 +32,8 @@ readWithdrawalScriptWitness sbe (stakeAddr, withdrawalAmt, Just certScriptReq) =
       case s of
         SimpleScript ss -> do
           return
-            (stakeAddr, withdrawalAmt
+            ( stakeAddr
+            , withdrawalAmt
             , Just $
                 WithdrawalScriptWitness
                   ( SimpleScriptWitness (sbeToSimpleScriptLanguageInEra sbe) $
@@ -60,7 +61,8 @@ readWithdrawalScriptWitness sbe (stakeAddr, withdrawalAmt, Just certScriptReq) =
               $ scriptLanguageSupportedInEra sbe
               $ PlutusScriptLanguage lang
           return
-            (stakeAddr, withdrawalAmt
+            ( stakeAddr
+            , withdrawalAmt
             , Just $
                 WithdrawalScriptWitness $
                   PlutusScriptWitness
@@ -96,7 +98,8 @@ readWithdrawalScriptWitness sbe (stakeAddr, withdrawalAmt, Just certScriptReq) =
               $ PlutusScriptLanguage lang
 
           return
-            (stakeAddr, withdrawalAmt
+            ( stakeAddr
+            , withdrawalAmt
             , Just $
                 WithdrawalScriptWitness $
                   PlutusScriptWitness

diff --git a/cardano-cli/src/Cardano/CLI/Types/Common.hs b/cardano-cli/src/Cardano/CLI/Types/Common.hs
@@ -57,7 +57,6 @@ module Cardano.CLI.Types.Common
   , ReferenceScriptSize (..)
   , RequiredSigner (..)
   , ScriptDataOrFile (..)
-  , ScriptDatumOrFile (..)
   , ScriptFile
   , ScriptRedeemerOrFile
   , SigningKeyFile
@@ -403,16 +402,6 @@ data ScriptDataOrFile
 
 type ScriptRedeemerOrFile = ScriptDataOrFile
 
-data ScriptDatumOrFile witctx where
-  ScriptDatumOrFileForTxIn
-    :: Maybe ScriptDataOrFile -- CIP-0069 - Spending datums optional in Conway era onwards
-    -> ScriptDatumOrFile WitCtxTxIn
-  InlineDatumPresentAtTxIn :: ScriptDatumOrFile WitCtxTxIn
-  NoScriptDatumOrFileForMint :: ScriptDatumOrFile WitCtxMint
-  NoScriptDatumOrFileForStake :: ScriptDatumOrFile WitCtxStake
-
-deriving instance Show (ScriptDatumOrFile witctx)
-
 newtype SlotsTillKesKeyExpiry = SlotsTillKesKeyExpiry {unSlotsTillKesKeyExpiry :: SlotNo}
   deriving (Eq, Show)