Skip to content

Commit a693f52

Browse files
lehinslehins
committed
Deprecate mkPlutusScript' 
1 parent 7927a88 commit a693f52

File tree

7 files changed

+25
-16
lines changed

7 files changed

+25
-16
lines changed

‎eras/alonzo/impl/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
### `testlib`
2020

21+
* Deprecated `mkPlutusScript'`
2122
* Change type signature of `genPlutusScript`, `genNativeScript`, `genAlonzoScript`, `alwaysSucceedsLang` and `alwaysFailsLang`.
2223
* Remove `TxInfoLanguage` and `mkTxInfoLanguage`
2324
* Added `Era` module with `AlonzoEraTest` class

‎eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/Arbitrary.hs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis (..))
4040
import Cardano.Ledger.Alonzo.PParams (AlonzoPParams (AlonzoPParams), OrdExUnits (OrdExUnits))
4141
import Cardano.Ledger.Alonzo.Plutus.Context (
4242
EraPlutusContext (ContextError),
43+
EraPlutusTxInfo,
4344
SupportedLanguage (..),
4445
mkSupportedPlutusScript,
4546
supportedLanguages,
@@ -439,17 +440,17 @@ instance Arbitrary AlonzoGenesis where
439440

440441
alwaysSucceeds ::
441442
forall l era.
442-
(HasCallStack, PlutusLanguage l, AlonzoEraScript era) =>
443+
(HasCallStack, EraPlutusTxInfo l era) =>
443444
Natural ->
444445
Script era
445-
alwaysSucceeds n = mkPlutusScript' (alwaysSucceedsPlutus @l n)
446+
alwaysSucceeds = fromPlutusScript . mkSupportedPlutusScript . alwaysSucceedsPlutus @l
446447

447448
alwaysFails ::
448449
forall l era.
449-
(HasCallStack, PlutusLanguage l, AlonzoEraScript era) =>
450+
(HasCallStack, EraPlutusTxInfo l era) =>
450451
Natural ->
451452
Script era
452-
alwaysFails n = mkPlutusScript' (alwaysFailsPlutus @l n)
453+
alwaysFails = fromPlutusScript . mkSupportedPlutusScript . alwaysFailsPlutus @l
453454

454455
alwaysSucceedsLang ::
455456
SupportedLanguage era ->
@@ -479,3 +480,4 @@ mkPlutusScript' plutus =
479480
error $
480481
"Plutus version " ++ show (plutusLanguage plutus) ++ " is not supported in " ++ eraName @era
481482
Just plutusScript -> fromPlutusScript plutusScript
483+
{-# DEPRECATED mkPlutusScript' "In favor of `fromPlutusScript` . `mkSupportedPlutusScript`" #-}

‎eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/AlonzoEraGen.hs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ import Test.QuickCheck hiding ((><))
129129
vKeyLockedAdaOnly :: TxOut AlonzoEra -> Bool
130130
vKeyLockedAdaOnly txOut = vKeyLocked txOut && isAdaOnly (txOut ^. valueTxOutL)
131131

132-
phase2scripts3Arg :: EraPlutusTxInfo PlutusV1 era => [TwoPhase3ArgInfo era]
132+
phase2scripts3Arg :: EraPlutusTxInfo 'PlutusV1 era => [TwoPhase3ArgInfo era]
133133
phase2scripts3Arg =
134134
[ mkTwoPhase3ArgInfo
135135
(mkSupportedPlutusScript (alwaysSucceedsPlutus @'PlutusV1 3))
@@ -172,7 +172,7 @@ phase2scripts3Arg =
172172
let script = fromPlutusScript plutusScript
173173
in TwoPhase3ArgInfo script (hashScript script)
174174

175-
phase2scripts2Arg :: EraPlutusTxInfo PlutusV1 era => [TwoPhase2ArgInfo era]
175+
phase2scripts2Arg :: EraPlutusTxInfo 'PlutusV1 era => [TwoPhase2ArgInfo era]
176176
phase2scripts2Arg =
177177
[ mkTwoPhase2ArgInfo
178178
(mkSupportedPlutusScript (alwaysSucceedsPlutus @'PlutusV1 2))
@@ -202,7 +202,7 @@ phase2scripts2Arg =
202202

203203
phase2scripts3ArgSucceeds ::
204204
forall era.
205-
EraPlutusTxInfo PlutusV1 era =>
205+
EraPlutusTxInfo 'PlutusV1 era =>
206206
Script era ->
207207
Bool
208208
phase2scripts3ArgSucceeds script =
@@ -211,15 +211,15 @@ phase2scripts3ArgSucceeds script =
211211

212212
phase2scripts2ArgSucceeds ::
213213
forall era.
214-
EraPlutusTxInfo PlutusV1 era =>
214+
EraPlutusTxInfo 'PlutusV1 era =>
215215
Script era ->
216216
Bool
217217
phase2scripts2ArgSucceeds script =
218218
maybe True getSucceeds2 $
219219
List.find (\info -> getScript2 info == script) phase2scripts2Arg
220220

221221
genPlutus2Arg ::
222-
EraPlutusTxInfo PlutusV1 era =>
222+
EraPlutusTxInfo 'PlutusV1 era =>
223223
Gen (Maybe (TwoPhase2ArgInfo era))
224224
genPlutus2Arg = frequency [(10, Just <$> elements phase2scripts2Arg), (90, pure Nothing)]
225225

‎eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/Imp.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec ::
3232
forall era.
3333
( AlonzoEraImp era
3434
, BabbageEraTxBody era
35-
, EraPlutusTxInfo PlutusV2 era
35+
, EraPlutusTxInfo 'PlutusV2 era
3636
, InjectRuleFailure "LEDGER" ShelleyDelegPredFailure era
3737
, InjectRuleFailure "LEDGER" ShelleyUtxoPredFailure era
3838
, InjectRuleFailure "LEDGER" AlonzoUtxoPredFailure era

‎eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/Imp/UtxowSpec.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec ::
3636
forall era.
3737
( AlonzoEraImp era
3838
, BabbageEraTxBody era
39-
, EraPlutusTxInfo PlutusV2 era
39+
, EraPlutusTxInfo 'PlutusV2 era
4040
, InjectRuleFailure "LEDGER" BabbageUtxowPredFailure era
4141
, InjectRuleFailure "LEDGER" AlonzoUtxosPredFailure era
4242
, InjectRuleFailure "LEDGER" AlonzoUtxowPredFailure era

‎eras/babbage/test-suite/src/Test/Cardano/Ledger/Babbage/TxInfo.hs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ inlineDatumOutput =
9393
mkBasicTxOut (shelleyAddr) (inject $ Coin 3)
9494
& datumTxOutL .~ datumEx
9595

96-
refScriptOutput :: BabbageEraTxOut era => TxOut era
96+
refScriptOutput :: (BabbageEraTxOut era, EraPlutusTxInfo 'PlutusV2 era) => TxOut era
9797
refScriptOutput =
9898
mkBasicTxOut (shelleyAddr) (inject $ Coin 3)
9999
& referenceScriptTxOutL .~ (SJust $ alwaysSucceeds @'PlutusV2 3)
@@ -111,6 +111,7 @@ inputWithRefScript = mkTxInPartial genesisId 4
111111

112112
utxo ::
113113
( BabbageEraTxOut era
114+
, EraPlutusTxInfo 'PlutusV2 era
114115
, Value era ~ MaryValue
115116
) =>
116117
UTxO era
@@ -173,6 +174,7 @@ successfulTranslation ::
173174
forall era l.
174175
( BabbageEraTxOut era
175176
, EraPlutusTxInfo l era
177+
, EraPlutusTxInfo 'PlutusV2 era
176178
, Value era ~ MaryValue
177179
) =>
178180
SLanguage l ->
@@ -196,6 +198,7 @@ expectTranslationError ::
196198
forall era l.
197199
( BabbageEraTxOut era
198200
, EraPlutusTxInfo l era
201+
, EraPlutusTxInfo 'PlutusV2 era
199202
, Value era ~ MaryValue
200203
) =>
201204
SLanguage l ->
@@ -218,6 +221,7 @@ expectTranslationError slang tx expected =
218221
expectV1TranslationError ::
219222
( BabbageEraTxOut era
220223
, EraPlutusTxInfo 'PlutusV1 era
224+
, EraPlutusTxInfo 'PlutusV2 era
221225
, Value era ~ MaryValue
222226
) =>
223227
Tx era ->
@@ -237,8 +241,8 @@ errorTranslate exampleName =
237241
translatedInputEx1 ::
238242
forall era.
239243
( BabbageEraTxOut era
240-
, Show (ContextError era)
241244
, Value era ~ MaryValue
245+
, EraPlutusTxInfo 'PlutusV2 era
242246
, Inject (BabbageContextError era) (ContextError era)
243247
) =>
244248
Proxy era ->
@@ -249,8 +253,8 @@ translatedInputEx1 _ =
249253
translatedInputEx2 ::
250254
forall era.
251255
( BabbageEraTxOut era
252-
, Show (ContextError era)
253256
, Value era ~ MaryValue
257+
, EraPlutusTxInfo 'PlutusV2 era
254258
, Inject (BabbageContextError era) (ContextError era)
255259
) =>
256260
Proxy era ->
@@ -274,7 +278,7 @@ translatedOutputEx1 _ =
274278
translatedOutputEx2 ::
275279
forall era.
276280
( BabbageEraTxOut era
277-
, Show (ContextError era)
281+
, EraPlutusTxInfo 'PlutusV2 era
278282
, Value era ~ MaryValue
279283
, Inject (BabbageContextError era) (ContextError era)
280284
) =>
@@ -290,6 +294,7 @@ txInfoTestsV1 ::
290294
, BabbageEraTxBody era
291295
, Value era ~ MaryValue
292296
, EraPlutusTxInfo 'PlutusV1 era
297+
, EraPlutusTxInfo 'PlutusV2 era
293298
, Inject (BabbageContextError era) (ContextError era)
294299
) =>
295300
Proxy era ->
@@ -339,6 +344,7 @@ txInfoTestsV2 ::
339344
forall era l.
340345
( EraTx era
341346
, EraPlutusTxInfo l era
347+
, EraPlutusTxInfo 'PlutusV2 era
342348
, BabbageEraTxBody era
343349
, Value era ~ MaryValue
344350
, Inject (BabbageContextError era) (ContextError era)

‎eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import Test.Cardano.Ledger.Shelley.ImpTest (ImpInit)
6363
spec ::
6464
forall era.
6565
( ConwayEraImp era
66-
, EraPlutusTxInfo PlutusV2 era
66+
, EraPlutusTxInfo 'PlutusV2 era
6767
, Inject (BabbageContextError era) (ContextError era)
6868
, Inject (ConwayContextError era) (ContextError era)
6969
, InjectRuleFailure "LEDGER" ConwayGovPredFailure era

0 commit comments

Comments
 (0)