Skip to content

Commit e8b67c2

Browse files
committed
Disambiguate the import of Cardano.Api.Experimental.Plutus
1 parent 0b01c5d commit e8b67c2

9 files changed

Lines changed: 32 additions & 33 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Cardano.Api.Compatible.Certificate qualified as Compatible
1818
import Cardano.Api.Experimental (obtainCommonConstraints)
1919
import Cardano.Api.Experimental qualified as Exp
2020
import Cardano.Api.Experimental.AnyScriptWitness qualified as Exp
21-
import Cardano.Api.Experimental.Plutus qualified as Exp
21+
import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
2222
import Cardano.Api.Experimental.Tx qualified as Exp
2323
import Cardano.Api.Ledger qualified as L hiding
2424
( VotingProcedures
@@ -158,9 +158,9 @@ readCertificateScriptWitnessSbe
158158
(OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits)
159159
) = do
160160
let plutusScriptFp = unFile scriptFp
161-
Exp.AnyPlutusScript anyPlutusScript <- Compatible.readFilePlutusScript sbe plutusScriptFp
161+
Exp.Plutus.AnyPlutusScript anyPlutusScript <- Compatible.readFilePlutusScript sbe plutusScriptFp
162162
let
163-
lang = Exp.plutusScriptInEraSLanguage anyPlutusScript
163+
lang = Exp.Plutus.plutusScriptInEraSLanguage anyPlutusScript
164164
let script' = Exp.PScript anyPlutusScript
165165

166166
redeemer <-

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import Cardano.Api
2121
)
2222
import Cardano.Api.Experimental qualified as Exp
2323
import Cardano.Api.Experimental.AnyScriptWitness qualified as Exp
24-
import Cardano.Api.Experimental.Plutus qualified as Exp
24+
import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
2525

2626
import Cardano.CLI.Compatible.Exception
2727
import Cardano.CLI.Compatible.Read (readFilePlutusScript, readFileSimpleScript)
@@ -68,8 +68,8 @@ readCertificateScriptWitness sbe certScriptReq =
6868
OnDiskPlutusScript
6969
(OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits) -> do
7070
let plutusScriptFp = unFile scriptFp
71-
Exp.AnyPlutusScript anyPlutusScript <- readFilePlutusScript sbe plutusScriptFp
72-
let lang = Exp.plutusScriptInEraSLanguage anyPlutusScript
71+
Exp.Plutus.AnyPlutusScript anyPlutusScript <- readFilePlutusScript sbe plutusScriptFp
72+
let lang = Exp.Plutus.plutusScriptInEraSLanguage anyPlutusScript
7373
script' = Exp.PScript anyPlutusScript
7474
redeemer <-
7575
fromExceptTCli $

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Cardano.Api (File (..))
1515
import Cardano.Api.Experimental
1616
import Cardano.Api.Experimental qualified as Exp
1717
import Cardano.Api.Experimental.AnyScriptWitness
18-
import Cardano.Api.Experimental.Plutus qualified as Exp
18+
import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
1919

2020
import Cardano.CLI.Compatible.Exception
2121
import Cardano.CLI.EraBased.Script.Read.Common
@@ -37,11 +37,11 @@ readCertificateScriptWitness
3737
(OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits)
3838
) = do
3939
let plutusScriptFp = unFile scriptFp
40-
Exp.AnyPlutusScript script <-
40+
Exp.Plutus.AnyPlutusScript script <-
4141
readFilePlutusScript @_ @era plutusScriptFp
4242

4343
let
44-
lang = Exp.plutusScriptInEraSLanguage script
44+
lang = Exp.Plutus.plutusScriptInEraSLanguage script
4545
script' = PScript script
4646

4747
redeemer <-

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ where
1313
import Cardano.Api hiding (AnyScriptWitness)
1414
import Cardano.Api.Experimental qualified as Exp
1515
import Cardano.Api.Experimental.AnyScriptWitness
16-
import Cardano.Api.Experimental.Plutus qualified as Exp
16+
import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
1717
import Cardano.Api.Experimental.Plutus qualified as L
1818
import Cardano.Api.Ledger qualified as L
1919

@@ -39,15 +39,15 @@ readMintScriptWitness
3939
(OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits)
4040
) = do
4141
let plutusScriptFp = unFile scriptFp
42-
Exp.AnyPlutusScript script <-
42+
Exp.Plutus.AnyPlutusScript script <-
4343
readFilePlutusScript @_ @era plutusScriptFp
4444
let polId = fromMaryPolicyID . L.PolicyID $ L.hashPlutusScriptInEra script
4545
redeemer <-
4646
fromExceptTCli $
4747
readScriptDataOrFile redeemerFile
4848

4949
let pScript = Exp.PScript script
50-
lang = Exp.plutusScriptInEraSLanguage script
50+
lang = Exp.Plutus.plutusScriptInEraSLanguage script
5151
let sw =
5252
Exp.PlutusScriptWitness
5353
lang

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Cardano.Api
1717
import Cardano.Api.Experimental (obtainCommonConstraints)
1818
import Cardano.Api.Experimental qualified as Exp
1919
import Cardano.Api.Experimental.AnyScriptWitness
20-
import Cardano.Api.Experimental.Plutus qualified as Exp
20+
import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
2121

2222
import Cardano.CLI.Compatible.Exception
2323
import Cardano.CLI.EraBased.Script.Proposal.Type
@@ -56,9 +56,9 @@ readProposalScriptWitness (propFp, Just certScriptReq) =
5656
OnDiskPlutusScript
5757
(OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits) -> do
5858
let plutusScriptFp = unFile scriptFp
59-
Exp.AnyPlutusScript plutusScript <-
59+
Exp.Plutus.AnyPlutusScript plutusScript <-
6060
readFilePlutusScript @_ @era plutusScriptFp
61-
let lang = Exp.plutusScriptInEraSLanguage plutusScript
61+
let lang = Exp.Plutus.plutusScriptInEraSLanguage plutusScript
6262
redeemer <-
6363
fromExceptTCli $
6464
readScriptDataOrFile redeemerFile

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import Cardano.Api.Experimental hiding
2626
)
2727
import Cardano.Api.Experimental qualified as Exp
2828
import Cardano.Api.Experimental.AnyScriptWitness qualified as Exp
29-
import Cardano.Api.Experimental.Plutus qualified as Exp
29+
import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
3030

3131
import Cardano.CLI.Compatible.Exception
3232
import Cardano.CLI.EraBased.Script.Read.Common
@@ -64,11 +64,11 @@ readSpendScriptWitness (Just spendScriptReq) =
6464
anyScript <-
6565
readFilePlutusScript @_ @era (unFile plutusScriptFp)
6666
case anyScript of
67-
Exp.AnyPlutusScript script -> do
67+
Exp.Plutus.AnyPlutusScript script -> do
6868
redeemer <-
6969
fromExceptTCli $
7070
readScriptDataOrFile redeemerFile
71-
let lang = Exp.plutusScriptInEraSLanguage script
71+
let lang = Exp.Plutus.plutusScriptInEraSLanguage script
7272
mDatum <- handlePotentialScriptDatum mScriptDatum lang
7373

7474
let pScript = Exp.PScript script

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ where
1414
import Cardano.Api
1515
import Cardano.Api.Experimental qualified as Exp
1616
import Cardano.Api.Experimental.AnyScriptWitness
17-
import Cardano.Api.Experimental.Plutus qualified as Exp
17+
import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
1818

1919
import Cardano.CLI.Compatible.Exception
2020
import Cardano.CLI.EraBased.Script.Read.Common
@@ -55,14 +55,14 @@ readVoteScriptWitness (voteFp, Just certScriptReq) = do
5555
OnDiskPlutusScript
5656
(OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits) -> do
5757
let plutusScriptFp = unFile scriptFp
58-
Exp.AnyPlutusScript script <-
58+
Exp.Plutus.AnyPlutusScript script <-
5959
readFilePlutusScript @_ @era plutusScriptFp
6060
redeemer <-
6161
fromExceptTCli $
6262
readScriptDataOrFile redeemerFile
6363

6464
let pScript = Exp.PScript script
65-
lang = Exp.plutusScriptInEraSLanguage script
65+
lang = Exp.Plutus.plutusScriptInEraSLanguage script
6666
let sw =
6767
Exp.PlutusScriptWitness
6868
lang

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Cardano.Api.Experimental
2020
)
2121
import Cardano.Api.Experimental qualified as Exp
2222
import Cardano.Api.Experimental.AnyScriptWitness
23-
import Cardano.Api.Experimental.Plutus qualified as Exp
23+
import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
2424

2525
import Cardano.CLI.Compatible.Exception
2626
import Cardano.CLI.EraBased.Script.Read.Common
@@ -48,13 +48,13 @@ readWithdrawalScriptWitness (stakeAddr, withdrawalAmt, Just certScriptReq) =
4848
)
4949
OnDiskPlutusScript (OnDiskPlutusScriptCliArgs scriptFp NoScriptDatumAllowed redeemerFile execUnits) -> do
5050
let plutusScriptFp = unFile scriptFp
51-
Exp.AnyPlutusScript script <-
51+
Exp.Plutus.AnyPlutusScript script <-
5252
readFilePlutusScript @_ @era plutusScriptFp
5353
redeemer <-
5454
fromExceptTCli $
5555
readScriptDataOrFile redeemerFile
5656

57-
let lang = Exp.plutusScriptInEraSLanguage script
57+
let lang = Exp.Plutus.plutusScriptInEraSLanguage script
5858
pScript = Exp.PScript script
5959
sw =
6060
Exp.PlutusScriptWitness

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ import Cardano.Api.Byron (ByronKey)
9999
import Cardano.Api.Byron qualified as Byron
100100
import Cardano.Api.Experimental (obtainCommonConstraints)
101101
import Cardano.Api.Experimental qualified as Exp
102-
import Cardano.Api.Experimental.AnyScript qualified as Exp
103-
import Cardano.Api.Experimental.Plutus qualified as Exp'
102+
import Cardano.Api.Experimental.Plutus qualified as Exp.Plutus
104103
import Cardano.Api.Ledger qualified as L
105104
import Cardano.Api.Parser.Text qualified as P
106105

@@ -221,12 +220,12 @@ readAnyScript anyScriptFp = do
221220
Right te -> do
222221
let scriptBs = teRawCBOR te
223222
TextEnvelopeType anyScriptType = teType te
224-
case Exp'.textToPlutusLanguage $ Text.pack anyScriptType of
223+
case Exp.Plutus.textToPlutusLanguage $ Text.pack anyScriptType of
225224
Just anyPlutusScriptLang -> do
226225
case Exp.obtainCommonConstraints (Exp.useEra @era) $
227-
Exp'.decodeAnyPlutusScript @(Exp.LedgerEra era) scriptBs anyPlutusScriptLang
228-
:: Either CBOR.DecoderError (Exp'.AnyPlutusScript (Exp.LedgerEra era)) of
229-
Right (Exp'.AnyPlutusScript plutusScript) -> return $ Exp.AnyPlutusScript plutusScript
226+
Exp.Plutus.decodeAnyPlutusScript @(Exp.LedgerEra era) scriptBs anyPlutusScriptLang
227+
:: Either CBOR.DecoderError (Exp.Plutus.AnyPlutusScript (Exp.LedgerEra era)) of
228+
Right (Exp.Plutus.AnyPlutusScript plutusScript) -> return $ Exp.AnyPlutusScript plutusScript
230229
Left e ->
231230
throwCliError $ "Failed to decode Plutus script: " <> show e
232231
-- Simple script text envelope format
@@ -821,16 +820,16 @@ readFilePlutusScript
821820
:: forall e era
822821
. Exp.IsEra era
823822
=> FilePath
824-
-> CIO e (Exp'.AnyPlutusScript (Exp.LedgerEra era))
823+
-> CIO e (Exp.Plutus.AnyPlutusScript (Exp.LedgerEra era))
825824
readFilePlutusScript plutusScriptFp = do
826825
bs <-
827826
readFileCli plutusScriptFp
828827
te <- fromEitherCli $ deserialiseFromJSON bs
829828
let scriptBs = teRawCBOR te
830829
TextEnvelopeType anyScriptType = teType te
831-
case Exp'.textToPlutusLanguage (Text.pack anyScriptType) of
830+
case Exp.Plutus.textToPlutusLanguage (Text.pack anyScriptType) of
832831
Just lang -> do
833-
let s :: Either CBOR.DecoderError (Exp'.AnyPlutusScript (Exp.LedgerEra era)) = obtainCommonConstraints (Exp.useEra @era) $ Exp'.decodeAnyPlutusScript scriptBs lang
832+
let s :: Either CBOR.DecoderError (Exp.Plutus.AnyPlutusScript (Exp.LedgerEra era)) = obtainCommonConstraints (Exp.useEra @era) $ Exp.Plutus.decodeAnyPlutusScript scriptBs lang
834833
fromEitherCli s
835834
Nothing ->
836835
throwCliError $ "Unsupported script language: " <> anyScriptType

0 commit comments

Comments
 (0)