Skip to content

Commit 6e60c79

Browse files
committed
Deprecate goldenBudget and goldenEvalCekCatch
`goldenEvalCekCatchBudget` should be used instead
1 parent 338617c commit 6e60c79

File tree

4 files changed

+9
-37
lines changed
  • plutus-benchmark/nofib/test
  • plutus-ledger-api/test-plugin/Spec/Data
  • plutus-tx/testlib/PlutusTx
  • plutus-tx-plugin/test/Strictness

4 files changed

+9
-37
lines changed

plutus-benchmark/nofib/test/Spec.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ testKnights = testGroup "knights" -- Odd sizes call "error" because there are n
7070
, testCase "depth 100, 8x8" $ mkKnightsTest 100 8
7171
, runTestGhc
7272
[ Tx.goldenPirReadable "knights10-4x4" knightsExample
73-
, Tx.goldenBudget "knights10-4x4" knightsExample
73+
, Tx.goldenEvalCekCatchBudget "knights10-4x4" knightsExample
7474
]
7575
]
7676
where knightsExample = Knights.mkKnightsCode 10 4
@@ -91,7 +91,7 @@ testQueens = testGroup "queens"
9191
, testCase "Fc" $ mkQueensTest 4 Queens.Fc
9292
, runTestGhc
9393
[ Tx.goldenPirReadable "queens4-bt" queens4btExample
94-
, Tx.goldenBudget "queens4-bt" queens4btExample
94+
, Tx.goldenEvalCekCatchBudget "queens4-bt" queens4btExample
9595
]
9696
]
9797
, testGroup "5x5"
@@ -102,7 +102,7 @@ testQueens = testGroup "queens"
102102
, testCase "Fc" $ mkQueensTest 5 Queens.Fc
103103
, runTestGhc
104104
[ Tx.goldenPirReadable "queens5-fc" queens5fcExample
105-
, Tx.goldenBudget "queens5-fc" queens5fcExample
105+
, Tx.goldenEvalCekCatchBudget "queens5-fc" queens5fcExample
106106
]
107107
]
108108
]

plutus-ledger-api/test-plugin/Spec/Data/Budget.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ tests =
3434
++ concatMap
3535
( \(TestCase name code) ->
3636
[ goldenEvalCekCatchBudget name code
37-
, goldenEvalCekCatch name [code]
3837
]
3938
)
4039
testCases

plutus-tx-plugin/test/Strictness/Spec.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@ import PlutusTx.TH (compile)
1616
tests :: TestNested
1717
tests =
1818
testNested "Strictness" . pure $ testNestedGhc
19-
[ goldenEvalCekCatch "lambda-default" [lambdaDefault `unsafeApplyCode` bot]
19+
[ goldenEvalCekCatchBudget "lambda-default" [lambdaDefault `unsafeApplyCode` bot]
2020
, goldenPirReadable "lambda-default" lambdaDefault
2121
, goldenUPlcReadable "lambda-default" lambdaDefault
2222

2323
-- FIXME: This should not crash, but it currently does.
24-
, goldenEvalCekCatch "lambda-nonstrict" [lambdaNonStrict `unsafeApplyCode` bot]
24+
, goldenEvalCekCatchBudget "lambda-nonstrict" [lambdaNonStrict `unsafeApplyCode` bot]
2525
, goldenPirReadable "lambda-nonstrict" lambdaNonStrict
2626
, goldenUPlcReadable "lambda-nonstrict" lambdaNonStrict
2727

28-
, goldenEvalCekCatch "lambda-strict" [lambdaStrict `unsafeApplyCode` bot]
28+
, goldenEvalCekCatchBudget "lambda-strict" [lambdaStrict `unsafeApplyCode` bot]
2929
, goldenPirReadable "lambda-strict" lambdaStrict
3030
, goldenUPlcReadable "lambda-strict" lambdaStrict
3131

3232
-- FIXME: This should crash (because the `Strict` extension is on), but it currently doesn't.
33-
, goldenEvalCekCatch "let-default" [letDefault `unsafeApplyCode` one]
33+
, goldenEvalCekCatchBudget "let-default" [letDefault `unsafeApplyCode` one]
3434
, goldenPirReadable "let-default" letDefault
3535
, goldenUPlcReadable "let-default" letDefault
3636

37-
, goldenEvalCekCatch "let-nonstrict" [letNonStrict `unsafeApplyCode` one]
37+
, goldenEvalCekCatchBudget "let-nonstrict" [letNonStrict `unsafeApplyCode` one]
3838
, goldenPirReadable "let-nonstrict" letNonStrict
3939
, goldenUPlcReadable "let-nonstrict" letNonStrict
4040

4141
-- FIXME: This should crash, but it currently doesn't.
42-
, goldenEvalCekCatch "let-strict" [letStrict `unsafeApplyCode` one]
42+
, goldenEvalCekCatchBudget "let-strict" [letStrict `unsafeApplyCode` one]
4343
, goldenPirReadable "let-strict" letStrict
4444
, goldenUPlcReadable "let-strict" letStrict
4545
]

plutus-tx/testlib/PlutusTx/Test.hs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,9 @@ module PlutusTx.Test (
2525

2626
-- * Evaluation testing
2727
goldenEvalCek,
28-
goldenEvalCekCatch,
2928
goldenEvalCekLog,
3029
goldenEvalCekCatchBudget,
3130

32-
-- * Budget and size testing
33-
goldenBudget,
34-
3531
-- * Combined testing
3632
goldenBundle,
3733
goldenBundle'
@@ -119,23 +115,6 @@ renderExcess :: (TestName, Integer) -> (TestName, Integer) -> Integer -> String
119115
renderExcess tData mData diff =
120116
renderEstimates tData mData <> "Remaining headroom: " <> show diff
121117

122-
{- | Does not include evaluation result. To include evaluation result, use
123-
`goldenEvalCekCatchBudget` instead of adding `goldenEvalCekCatch`
124-
-}
125-
goldenBudget :: TestName -> CompiledCode a -> TestNested
126-
goldenBudget name compiledCode = do
127-
nestedGoldenVsDocM name ".budget" $ ppCatch $ do
128-
(_, PLC.ExBudget cpu mem) <- runPlcCekBudget [compiledCode]
129-
size <- UPLC.programSize <$> toUPlc compiledCode
130-
let contents =
131-
"cpu: "
132-
<> pretty cpu
133-
<> "\nmem: "
134-
<> pretty mem
135-
<> "\nsize: "
136-
<> pretty size
137-
pure (render @Text contents)
138-
139118
goldenBundle
140119
:: TestName
141120
-> CompiledCodeIn UPLC.DefaultUni UPLC.DefaultFun a
@@ -210,12 +189,6 @@ goldenEvalCek name values =
210189
nestedGoldenVsDocM name ".eval" $
211190
prettyPlcClassicSimple <$> rethrow (runPlcCek values)
212191

213-
goldenEvalCekCatch :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) => TestName -> [a] -> TestNested
214-
goldenEvalCekCatch name values =
215-
nestedGoldenVsDocM name ".eval" $
216-
either (pretty . show) prettyPlcClassicSimple
217-
<$> runExceptT (runPlcCek values)
218-
219192
goldenEvalCekLog :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) => TestName -> [a] -> TestNested
220193
goldenEvalCekLog name values =
221194
nestedGoldenVsDocM name ".eval" $

0 commit comments

Comments
 (0)