Disambiguate the import of Cardano.Api.Experimental.Plutus

Author: geo2a

cardano-cli/src/Cardano/CLI/Compatible/Transaction/Run.hs

@@ -18,7 +18,7 @@ import Cardano.Api.Compatible.Certificate qualified as Compatible
 import Cardano.Api.Experimental (obtainCommonConstraints)
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness qualified as Exp
-import Cardano.Api.Experimental.Plutus qualified as Exp
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 import Cardano.Api.Experimental.Tx qualified as Exp
 import Cardano.Api.Ledger qualified as L hiding
   ( VotingProcedures
@@ -158,9 +158,9 @@ readCertificateScriptWitnessSbe
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits)
     ) = do
     let plutusScriptFp = unFile scriptFp
-    Exp.AnyPlutusScript anyPlutusScript <- Compatible.readFilePlutusScript sbe plutusScriptFp
+    Exp.Plutus.AnyPlutusScript anyPlutusScript <- Compatible.readFilePlutusScript sbe plutusScriptFp
     let
-      lang = Exp.plutusScriptInEraSLanguage anyPlutusScript
+      lang = Exp.Plutus.plutusScriptInEraSLanguage anyPlutusScript
     let script' = Exp.PScript anyPlutusScript
 
     redeemer <-

cardano-cli/src/Cardano/CLI/Compatible/Transaction/ScriptWitness.hs

@@ -21,7 +21,7 @@ import Cardano.Api
   )
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness qualified as Exp
-import Cardano.Api.Experimental.Plutus qualified as Exp
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.Compatible.Read (readFilePlutusScript, readFileSimpleScript)
@@ -68,8 +68,8 @@ readCertificateScriptWitness sbe certScriptReq =
     OnDiskPlutusScript
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits) -> do
         let plutusScriptFp = unFile scriptFp
-        Exp.AnyPlutusScript anyPlutusScript <- readFilePlutusScript sbe plutusScriptFp
-        let lang = Exp.plutusScriptInEraSLanguage anyPlutusScript
+        Exp.Plutus.AnyPlutusScript anyPlutusScript <- readFilePlutusScript sbe plutusScriptFp
+        let lang = Exp.Plutus.plutusScriptInEraSLanguage anyPlutusScript
             script' = Exp.PScript anyPlutusScript
         redeemer <-
           fromExceptTCli $

cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs

@@ -15,7 +15,7 @@ import Cardano.Api (File (..))
 import Cardano.Api.Experimental
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness
-import Cardano.Api.Experimental.Plutus qualified as Exp
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.EraBased.Script.Read.Common
@@ -37,11 +37,11 @@ readCertificateScriptWitness
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits)
     ) = do
     let plutusScriptFp = unFile scriptFp
-    Exp.AnyPlutusScript script <-
+    Exp.Plutus.AnyPlutusScript script <-
       readFilePlutusScript @_ @era plutusScriptFp
 
     let
-      lang = Exp.plutusScriptInEraSLanguage script
+      lang = Exp.Plutus.plutusScriptInEraSLanguage script
       script' = PScript script
 
     redeemer <-

cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Read.hs

@@ -13,7 +13,7 @@ where
 import Cardano.Api hiding (AnyScriptWitness)
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness
-import Cardano.Api.Experimental.Plutus qualified as Exp
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 import Cardano.Api.Experimental.Plutus qualified as L
 import Cardano.Api.Ledger qualified as L
 
@@ -39,15 +39,15 @@ readMintScriptWitness
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits)
     ) = do
     let plutusScriptFp = unFile scriptFp
-    Exp.AnyPlutusScript script <-
+    Exp.Plutus.AnyPlutusScript script <-
       readFilePlutusScript @_ @era plutusScriptFp
     let polId = fromMaryPolicyID . L.PolicyID $ L.hashPlutusScriptInEra script
     redeemer <-
       fromExceptTCli $
         readScriptDataOrFile redeemerFile
 
     let pScript = Exp.PScript script
-        lang = Exp.plutusScriptInEraSLanguage script
+        lang = Exp.Plutus.plutusScriptInEraSLanguage script
     let sw =
           Exp.PlutusScriptWitness
             lang

cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Read.hs

@@ -17,7 +17,7 @@ import Cardano.Api
 import Cardano.Api.Experimental (obtainCommonConstraints)
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness
-import Cardano.Api.Experimental.Plutus qualified as Exp
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.EraBased.Script.Proposal.Type
@@ -56,9 +56,9 @@ readProposalScriptWitness (propFp, Just certScriptReq) =
       OnDiskPlutusScript
         (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits) -> do
           let plutusScriptFp = unFile scriptFp
-          Exp.AnyPlutusScript plutusScript <-
+          Exp.Plutus.AnyPlutusScript plutusScript <-
             readFilePlutusScript @_ @era plutusScriptFp
-          let lang = Exp.plutusScriptInEraSLanguage plutusScript
+          let lang = Exp.Plutus.plutusScriptInEraSLanguage plutusScript
           redeemer <-
             fromExceptTCli $
               readScriptDataOrFile redeemerFile

cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Read.hs

@@ -26,7 +26,7 @@ import Cardano.Api.Experimental hiding
   )
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness qualified as Exp
-import Cardano.Api.Experimental.Plutus qualified as Exp
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.EraBased.Script.Read.Common
@@ -64,11 +64,11 @@ readSpendScriptWitness (Just spendScriptReq) =
         anyScript <-
           readFilePlutusScript @_ @era (unFile plutusScriptFp)
         case anyScript of
-          Exp.AnyPlutusScript script -> do
+          Exp.Plutus.AnyPlutusScript script -> do
             redeemer <-
               fromExceptTCli $
                 readScriptDataOrFile redeemerFile
-            let lang = Exp.plutusScriptInEraSLanguage script
+            let lang = Exp.Plutus.plutusScriptInEraSLanguage script
             mDatum <- handlePotentialScriptDatum mScriptDatum lang
 
             let pScript = Exp.PScript script

cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Read.hs

@@ -14,7 +14,7 @@ where
 import Cardano.Api
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness
-import Cardano.Api.Experimental.Plutus qualified as Exp
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.EraBased.Script.Read.Common
@@ -55,14 +55,14 @@ readVoteScriptWitness (voteFp, Just certScriptReq) = do
     OnDiskPlutusScript
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits) -> do
         let plutusScriptFp = unFile scriptFp
-        Exp.AnyPlutusScript script <-
+        Exp.Plutus.AnyPlutusScript script <-
           readFilePlutusScript @_ @era plutusScriptFp
         redeemer <-
           fromExceptTCli $
             readScriptDataOrFile redeemerFile
 
         let pScript = Exp.PScript script
-            lang = Exp.plutusScriptInEraSLanguage script
+            lang = Exp.Plutus.plutusScriptInEraSLanguage script
         let sw =
               Exp.PlutusScriptWitness
                 lang

cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs

@@ -20,7 +20,7 @@ import Cardano.Api.Experimental
   )
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness
-import Cardano.Api.Experimental.Plutus qualified as Exp
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.EraBased.Script.Read.Common
@@ -48,13 +48,13 @@ readWithdrawalScriptWitness (stakeAddr, withdrawalAmt, Just certScriptReq) =
         )
     OnDiskPlutusScript (OnDiskPlutusScriptCliArgs scriptFp NoScriptDatumAllowed redeemerFile execUnits) -> do
       let plutusScriptFp = unFile scriptFp
-      Exp.AnyPlutusScript script <-
+      Exp.Plutus.AnyPlutusScript script <-
         readFilePlutusScript @_ @era plutusScriptFp
       redeemer <-
         fromExceptTCli $
           readScriptDataOrFile redeemerFile
 
-      let lang = Exp.plutusScriptInEraSLanguage script
+      let lang = Exp.Plutus.plutusScriptInEraSLanguage script
           pScript = Exp.PScript script
           sw =
             Exp.PlutusScriptWitness

cardano-cli/src/Cardano/CLI/Read.hs

@@ -99,8 +99,7 @@ import Cardano.Api.Byron (ByronKey)
 import Cardano.Api.Byron qualified as Byron
 import Cardano.Api.Experimental (obtainCommonConstraints)
 import Cardano.Api.Experimental qualified as Exp
-import Cardano.Api.Experimental.AnyScript qualified as Exp
-import Cardano.Api.Experimental.Plutus qualified as Exp'
+import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
 import Cardano.Api.Ledger qualified as L
 import Cardano.Api.Parser.Text qualified as P
 
@@ -221,12 +220,12 @@ readAnyScript anyScriptFp = do
     Right te -> do
       let scriptBs = teRawCBOR te
           TextEnvelopeType anyScriptType = teType te
-      case Exp'.textToPlutusLanguage $ Text.pack anyScriptType of
+      case Exp.Plutus.textToPlutusLanguage $ Text.pack anyScriptType of
         Just anyPlutusScriptLang -> do
           case Exp.obtainCommonConstraints (Exp.useEra @era) $
-                 Exp'.decodeAnyPlutusScript @(Exp.LedgerEra era) scriptBs anyPlutusScriptLang
-                 :: Either CBOR.DecoderError (Exp'.AnyPlutusScript (Exp.LedgerEra era)) of
-            Right (Exp'.AnyPlutusScript plutusScript) -> return $ Exp.AnyPlutusScript plutusScript
+                 Exp.Plutus.decodeAnyPlutusScript @(Exp.LedgerEra era) scriptBs anyPlutusScriptLang
+                 :: Either CBOR.DecoderError (Exp.Plutus.AnyPlutusScript (Exp.LedgerEra era)) of
+            Right (Exp.Plutus.AnyPlutusScript plutusScript) -> return $ Exp.AnyPlutusScript plutusScript
             Left e ->
               throwCliError $ "Failed to decode Plutus script: " <> show e
         -- Simple script text envelope format
@@ -821,16 +820,16 @@ readFilePlutusScript
   :: forall e era
    . Exp.IsEra era
   => FilePath
-  -> CIO e (Exp'.AnyPlutusScript (Exp.LedgerEra era))
+  -> CIO e (Exp.Plutus.AnyPlutusScript (Exp.LedgerEra era))
 readFilePlutusScript plutusScriptFp = do
   bs <-
     readFileCli plutusScriptFp
   te <- fromEitherCli $ deserialiseFromJSON bs
   let scriptBs = teRawCBOR te
       TextEnvelopeType anyScriptType = teType te
-  case Exp'.textToPlutusLanguage (Text.pack anyScriptType) of
+  case Exp.Plutus.textToPlutusLanguage (Text.pack anyScriptType) of
     Just lang -> do
-      let s :: Either CBOR.DecoderError (Exp'.AnyPlutusScript (Exp.LedgerEra era)) = obtainCommonConstraints (Exp.useEra @era) $ Exp'.decodeAnyPlutusScript scriptBs lang
+      let s :: Either CBOR.DecoderError (Exp.Plutus.AnyPlutusScript (Exp.LedgerEra era)) = obtainCommonConstraints (Exp.useEra @era) $ Exp.Plutus.decodeAnyPlutusScript scriptBs lang
       fromEitherCli s
     Nothing ->
       throwCliError $ "Unsupported script language: " <> anyScriptType