diff --git a/plutus-benchmark/bitwise/test/9.6/8 queens.budget.golden b/plutus-benchmark/bitwise/test/9.6/8 queens.budget.golden deleted file mode 100644 index 01018c525b6..00000000000 --- a/plutus-benchmark/bitwise/test/9.6/8 queens.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 381725318016 -mem: 1403857547 -size: 380 \ No newline at end of file diff --git a/plutus-benchmark/bitwise/test/9.6/8 queens.eval.golden b/plutus-benchmark/bitwise/test/9.6/8 queens.eval.golden index 0e22c97c06d..83015d8f8e9 100644 --- a/plutus-benchmark/bitwise/test/9.6/8 queens.eval.golden +++ b/plutus-benchmark/bitwise/test/9.6/8 queens.eval.golden @@ -1,3 +1,7 @@ +cpu: 381725318016 +mem: 1403857547 +size: 380 + (constr 1 (constr 0 (con integer 0) (con integer 0)) diff --git a/plutus-benchmark/bitwise/test/9.6/Ed25519.budget.golden b/plutus-benchmark/bitwise/test/9.6/Ed25519.budget.golden deleted file mode 100644 index 27e46a12c1f..00000000000 --- a/plutus-benchmark/bitwise/test/9.6/Ed25519.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 2025744495066 -mem: 6392763186 -size: 3415 \ No newline at end of file diff --git a/plutus-benchmark/bitwise/test/9.6/Ed25519.eval.golden b/plutus-benchmark/bitwise/test/9.6/Ed25519.eval.golden index f217693e82c..79d455b753d 100644 --- a/plutus-benchmark/bitwise/test/9.6/Ed25519.eval.golden +++ b/plutus-benchmark/bitwise/test/9.6/Ed25519.eval.golden @@ -1 +1,5 @@ +cpu: 2025744495066 +mem: 6392763186 +size: 3415 + (constr 1) \ No newline at end of file diff --git a/plutus-benchmark/bitwise/test/Main.hs b/plutus-benchmark/bitwise/test/Main.hs index c7b60a1b004..15973b70d58 100644 --- a/plutus-benchmark/bitwise/test/Main.hs +++ b/plutus-benchmark/bitwise/test/Main.hs @@ -13,7 +13,7 @@ import PlutusBenchmark.NQueens.Compiled (dimAsData, nqueensCompiled) import PlutusBenchmark.SHA512 (sha512) import PlutusTx.Builtins (fromBuiltin, toBuiltin) import PlutusTx.Code (unsafeApplyCode) -import PlutusTx.Test (goldenBudget, goldenEvalCekCatch, goldenPirReadable) +import PlutusTx.Test (goldenEvalCekCatchBudget, goldenPirReadable) import Test.Tasty (TestTree, defaultMain, testGroup) import Test.Tasty.Extras (TestNested, runTestNested, testNestedGhc) import Test.Tasty.HUnit (assertEqual, testCase) @@ -24,10 +24,9 @@ main = defaultMain . testGroup "bitwise" $ [ testCase "solves for 8 queens" $ assertEqual "" [(0,0), (1,4), (2,7), (3,5), (4,2), (5,6), (6,1), (7,3)] (nqueens 8), - runTestGhc [ - goldenPirReadable "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData, - goldenBudget "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData, - goldenEvalCekCatch "8 queens" [nqueensCompiled `unsafeApplyCode` dimAsData] + runTestGhc + [ goldenPirReadable "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData + , goldenEvalCekCatchBudget "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData ] ], testGroup "Ed25519" [ @@ -36,11 +35,8 @@ main = defaultMain . testGroup "bitwise" $ [ runTestGhc [ goldenPirReadable "Ed25519" $ checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData, - goldenBudget "Ed25519" $ - checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData, - goldenEvalCekCatch "Ed25519" [ + goldenEvalCekCatchBudget "Ed25519" $ checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData - ] ] ] ] diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.budget.golden deleted file mode 100644 index 629334d47af..00000000000 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 182838904 -mem: 755152 -size: 151 \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.eval.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.eval.golden new file mode 100644 index 00000000000..217f65d5c9c --- /dev/null +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.eval.golden @@ -0,0 +1,5 @@ +cpu: 182838904 +mem: 755152 +size: 151 + +(con integer 155) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.eval.golden similarity index 50% rename from plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.budget.golden rename to plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.eval.golden index a09927b67cd..fbe76190b71 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.eval.golden @@ -1,3 +1,5 @@ cpu: 15206420194 mem: 62404432 -size: 151 \ No newline at end of file +size: 151 + +(con integer 15050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.budget.golden deleted file mode 100644 index fa05f251b3a..00000000000 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 54709074 -mem: 227692 -size: 151 \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.eval.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.eval.golden new file mode 100644 index 00000000000..9979862e6c1 --- /dev/null +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.eval.golden @@ -0,0 +1,5 @@ +cpu: 54709074 +mem: 227692 +size: 151 + +(con integer 40) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.eval.golden similarity index 50% rename from plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.budget.golden rename to plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.eval.golden index 8006e5b2a2a..509d9295527 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.eval.golden @@ -1,3 +1,5 @@ cpu: 3885192144 mem: 15954832 -size: 151 \ No newline at end of file +size: 151 + +(con integer 3775) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.budget.golden deleted file mode 100644 index 5487b4e473d..00000000000 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 101489780 -mem: 461880 -size: 234 \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.eval.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.eval.golden new file mode 100644 index 00000000000..08a9cda0a20 --- /dev/null +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.eval.golden @@ -0,0 +1,5 @@ +cpu: 101489780 +mem: 461880 +size: 234 + +(con integer 155) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.eval.golden similarity index 50% rename from plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.budget.golden rename to plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.eval.golden index 4310113d618..e9045ec8c2f 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.eval.golden @@ -1,3 +1,5 @@ cpu: 8116454900 mem: 36124200 -size: 954 \ No newline at end of file +size: 954 + +(con integer 15050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.budget.golden deleted file mode 100644 index cdbc7fda8c0..00000000000 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 31269190 -mem: 145040 -size: 194 \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.eval.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.eval.golden new file mode 100644 index 00000000000..89f15e11ade --- /dev/null +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.eval.golden @@ -0,0 +1,5 @@ +cpu: 31269190 +mem: 145040 +size: 194 + +(con integer 40) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.eval.golden similarity index 50% rename from plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.budget.golden rename to plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.eval.golden index 0a9bda51ae4..92cf66724d3 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.eval.golden @@ -1,3 +1,5 @@ cpu: 2084516500 mem: 9303800 -size: 554 \ No newline at end of file +size: 554 + +(con integer 3775) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/Spec.hs b/plutus-benchmark/lists/test/Lookup/Spec.hs index 132ead7ec62..e02edf33f2c 100644 --- a/plutus-benchmark/lists/test/Lookup/Spec.hs +++ b/plutus-benchmark/lists/test/Lookup/Spec.hs @@ -16,9 +16,9 @@ tests :: TestTree tests = runTestGhc ["Lookup"] $ flip concatMap sizes $ \sz -> - [ Tx.goldenBudget ("match-scott-list-" ++ show sz) $ + [ Tx.goldenEvalCekCatchBudget ("match-scott-list-" ++ show sz) $ Compiled.mkMatchWithListsCode (Compiled.workloadOfSize sz) - , Tx.goldenBudget ("match-builtin-list-" ++ show sz) $ + , Tx.goldenEvalCekCatchBudget ("match-builtin-list-" ++ show sz) $ Compiled.mkMatchWithBuiltinListsCode (Compiled.workloadOfSize sz) ] where diff --git a/plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.budget.golden deleted file mode 100644 index e7208e1e20d..00000000000 --- a/plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 122258594 -mem: 523832 -size: 78 \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.eval.golden b/plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.eval.golden new file mode 100644 index 00000000000..71c1a389f89 --- /dev/null +++ b/plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.eval.golden @@ -0,0 +1,5 @@ +cpu: 122258594 +mem: 523832 +size: 78 + +(con integer 5050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.budget.golden deleted file mode 100644 index 6303427bfc9..00000000000 --- a/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 309967632 -mem: 1237030 -size: 173 \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.eval.golden b/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.eval.golden new file mode 100644 index 00000000000..0afc2e25c06 --- /dev/null +++ b/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.eval.golden @@ -0,0 +1,5 @@ +cpu: 309967632 +mem: 1237030 +size: 173 + +(con integer 5050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.budget.golden deleted file mode 100644 index 53a15e843ea..00000000000 --- a/plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 69848900 -mem: 373600 -size: 263 \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.eval.golden b/plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.eval.golden new file mode 100644 index 00000000000..8614cc4f6ab --- /dev/null +++ b/plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.eval.golden @@ -0,0 +1,5 @@ +cpu: 69848900 +mem: 373600 +size: 263 + +(con integer 5050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.budget.golden deleted file mode 100644 index e3107cc7b3b..00000000000 --- a/plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 127058594 -mem: 553832 -size: 81 \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.eval.golden b/plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.eval.golden new file mode 100644 index 00000000000..2052b873170 --- /dev/null +++ b/plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.eval.golden @@ -0,0 +1,5 @@ +cpu: 127058594 +mem: 553832 +size: 81 + +(con integer 5050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.budget.golden deleted file mode 100644 index e73e24394e2..00000000000 --- a/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 314767632 -mem: 1267030 -size: 176 \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.eval.golden b/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.eval.golden new file mode 100644 index 00000000000..72b316c76a2 --- /dev/null +++ b/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.eval.golden @@ -0,0 +1,5 @@ +cpu: 314767632 +mem: 1267030 +size: 176 + +(con integer 5050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.budget.golden deleted file mode 100644 index 23c02b50d87..00000000000 --- a/plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 74648900 -mem: 403600 -size: 266 \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.eval.golden b/plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.eval.golden new file mode 100644 index 00000000000..97af75ddec8 --- /dev/null +++ b/plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.eval.golden @@ -0,0 +1,5 @@ +cpu: 74648900 +mem: 403600 +size: 266 + +(con integer 5050) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/Spec.hs b/plutus-benchmark/lists/test/Sum/Spec.hs index 89892581fd0..6c989fef2dd 100644 --- a/plutus-benchmark/lists/test/Sum/Spec.hs +++ b/plutus-benchmark/lists/test/Sum/Spec.hs @@ -38,12 +38,12 @@ tests = , testProperty "Compiled left fold (data lists)" $ prop_sum Compiled.mkSumLeftDataTerm ] , runTestGhc ["Sum"] - [ Tx.goldenBudget "right-fold-scott" $ Compiled.mkSumRightScottCode input - , Tx.goldenBudget "right-fold-built-in" $ Compiled.mkSumRightBuiltinCode input - , Tx.goldenBudget "right-fold-data" $ Compiled.mkSumRightDataCode input - , Tx.goldenBudget "left-fold-scott" $ Compiled.mkSumLeftScottCode input - , Tx.goldenBudget "left-fold-built-in" $ Compiled.mkSumLeftBuiltinCode input - , Tx.goldenBudget "left-fold-data" $ Compiled.mkSumLeftDataCode input + [ Tx.goldenEvalCekCatchBudget "right-fold-scott" $ Compiled.mkSumRightScottCode input + , Tx.goldenEvalCekCatchBudget "right-fold-built-in" $ Compiled.mkSumRightBuiltinCode input + , Tx.goldenEvalCekCatchBudget "right-fold-data" $ Compiled.mkSumRightDataCode input + , Tx.goldenEvalCekCatchBudget "left-fold-scott" $ Compiled.mkSumLeftScottCode input + , Tx.goldenEvalCekCatchBudget "left-fold-built-in" $ Compiled.mkSumLeftBuiltinCode input + , Tx.goldenEvalCekCatchBudget "left-fold-data" $ Compiled.mkSumLeftDataCode input ] ] where input = [1..100] diff --git a/plutus-benchmark/nofib/test/9.6/clausify-F5.budget.golden b/plutus-benchmark/nofib/test/9.6/clausify-F5.budget.golden deleted file mode 100644 index d6de37a933d..00000000000 --- a/plutus-benchmark/nofib/test/9.6/clausify-F5.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 50150307160 -mem: 293209180 -size: 1615 \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/clausify-F5.eval.golden b/plutus-benchmark/nofib/test/9.6/clausify-F5.eval.golden index 1dd2b8ed5d3..d0ddc7a0bd1 100644 --- a/plutus-benchmark/nofib/test/9.6/clausify-F5.eval.golden +++ b/plutus-benchmark/nofib/test/9.6/clausify-F5.eval.golden @@ -1 +1,5 @@ +cpu: 50150307160 +mem: 293209180 +size: 1615 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden b/plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden deleted file mode 100644 index af80b8b134a..00000000000 --- a/plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1395086000 -mem: 7028012 -size: 2021 \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/knights10-4x4.eval.golden b/plutus-benchmark/nofib/test/9.6/knights10-4x4.eval.golden index 1dd2b8ed5d3..4c4b6a74054 100644 --- a/plutus-benchmark/nofib/test/9.6/knights10-4x4.eval.golden +++ b/plutus-benchmark/nofib/test/9.6/knights10-4x4.eval.golden @@ -1 +1,5 @@ +cpu: 1395086000 +mem: 7028012 +size: 2021 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden b/plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden deleted file mode 100644 index 4d3081fb8f9..00000000000 --- a/plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 4302046267 -mem: 22978130 -size: 2067 \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/queens4-bt.eval.golden b/plutus-benchmark/nofib/test/9.6/queens4-bt.eval.golden index 32ee208e6aa..0453f67c1cf 100644 --- a/plutus-benchmark/nofib/test/9.6/queens4-bt.eval.golden +++ b/plutus-benchmark/nofib/test/9.6/queens4-bt.eval.golden @@ -1,3 +1,7 @@ +cpu: 4302046267 +mem: 22978130 +size: 2067 + (constr 1 (constr diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden b/plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden deleted file mode 100644 index 5bbabdd554f..00000000000 --- a/plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 153231070621 -mem: 860817866 -size: 2067 \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.eval.golden b/plutus-benchmark/nofib/test/9.6/queens5-fc.eval.golden index bdca70a0772..15a05269b50 100644 --- a/plutus-benchmark/nofib/test/9.6/queens5-fc.eval.golden +++ b/plutus-benchmark/nofib/test/9.6/queens5-fc.eval.golden @@ -1,3 +1,7 @@ +cpu: 153231070621 +mem: 860817866 +size: 2067 + (constr 1 (constr diff --git a/plutus-benchmark/nofib/test/Spec.hs b/plutus-benchmark/nofib/test/Spec.hs index 1613f097f1d..261b7b0040d 100644 --- a/plutus-benchmark/nofib/test/Spec.hs +++ b/plutus-benchmark/nofib/test/Spec.hs @@ -49,8 +49,7 @@ testClausify = testGroup "clausify" , testCase "formula5" $ mkClausifyTest Clausify.F5 , runTestGhc [ Tx.goldenPirReadable "clausify-F5" formula5example - , Tx.goldenBudget "clausify-F5" formula5example - , Tx.goldenEvalCekCatch "clausify-F5" [formula5example] + , Tx.goldenEvalCekCatchBudget "clausify-F5" formula5example ] ] where formula5example = Clausify.mkClausifyCode Clausify.F5 @@ -71,8 +70,7 @@ testKnights = testGroup "knights" -- Odd sizes call "error" because there are n , testCase "depth 100, 8x8" $ mkKnightsTest 100 8 , runTestGhc [ Tx.goldenPirReadable "knights10-4x4" knightsExample - , Tx.goldenBudget "knights10-4x4" knightsExample - , Tx.goldenEvalCekCatch "knights10-4x4" [knightsExample] + , Tx.goldenEvalCekCatchBudget "knights10-4x4" knightsExample ] ] where knightsExample = Knights.mkKnightsCode 10 4 @@ -93,8 +91,7 @@ testQueens = testGroup "queens" , testCase "Fc" $ mkQueensTest 4 Queens.Fc , runTestGhc [ Tx.goldenPirReadable "queens4-bt" queens4btExample - , Tx.goldenBudget "queens4-bt" queens4btExample - , Tx.goldenEvalCekCatch "queens4-bt" [queens4btExample] + , Tx.goldenEvalCekCatchBudget "queens4-bt" queens4btExample ] ] , testGroup "5x5" @@ -105,8 +102,7 @@ testQueens = testGroup "queens" , testCase "Fc" $ mkQueensTest 5 Queens.Fc , runTestGhc [ Tx.goldenPirReadable "queens5-fc" queens5fcExample - , Tx.goldenBudget "queens5-fc" queens5fcExample - , Tx.goldenEvalCekCatch "queens5-fc" [queens5fcExample] + , Tx.goldenEvalCekCatchBudget "queens5-fc" queens5fcExample ] ] ] diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.budget.golden deleted file mode 100644 index 3dfa189526b..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 261922639 -mem: 989819 -size: 1626 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.eval.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.eval.golden index 1dd2b8ed5d3..be8640f6b0f 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.eval.golden @@ -1 +1,5 @@ +cpu: 261922639 +mem: 989819 +size: 1626 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.budget.golden deleted file mode 100644 index 380036a38c9..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 74418943 -mem: 283387 -size: 1626 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.eval.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.eval.golden index 1dd2b8ed5d3..6559a6ac570 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.eval.golden @@ -1 +1,5 @@ +cpu: 74418943 +mem: 283387 +size: 1626 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.budget.golden deleted file mode 100644 index da7ba8b7671..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 253542167 -mem: 951676 -size: 1562 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.eval.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.eval.golden index 1dd2b8ed5d3..7c5fae09e85 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.eval.golden @@ -1 +1,5 @@ +cpu: 253542167 +mem: 951676 +size: 1562 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.budget.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.budget.golden deleted file mode 100644 index 497b24da8da..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 72009799 -mem: 272476 -size: 1562 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.eval.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.eval.golden index 1dd2b8ed5d3..a68f3df4ed2 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.eval.golden @@ -1 +1,5 @@ +cpu: 72009799 +mem: 272476 +size: 1562 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.budget.golden deleted file mode 100644 index 5e58b373976..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 34774758 -mem: 30802 -size: 316 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.eval.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.eval.golden index 1dd2b8ed5d3..54b6822c2d1 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.eval.golden @@ -1 +1,5 @@ +cpu: 34774758 +mem: 30802 +size: 316 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityOverhead-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityOverhead-20.budget.golden deleted file mode 100644 index dc0c75a85f7..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityOverhead-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 4704100 -mem: 29500 -size: 294 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityOverhead-20.eval.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityOverhead-20.eval.golden index 1dd2b8ed5d3..428630e65b6 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityOverhead-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityOverhead-20.eval.golden @@ -1 +1,5 @@ +cpu: 4704100 +mem: 29500 +size: 294 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.budget.golden deleted file mode 100644 index af99b459d53..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 20276762 -mem: 72951 -size: 96 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.eval.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.eval.golden index 1dd2b8ed5d3..48bf06c005d 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.eval.golden @@ -1 +1,5 @@ +cpu: 20276762 +mem: 72951 +size: 96 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.budget.golden deleted file mode 100644 index 245203cf738..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5700522 -mem: 20183 -size: 96 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.eval.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.eval.golden index 1dd2b8ed5d3..b79c11af0ef 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.eval.golden @@ -1 +1,5 @@ +cpu: 5700522 +mem: 20183 +size: 96 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-20.budget.golden deleted file mode 100644 index 5acec6cac96..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 64100 -mem: 500 -size: 4 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-20.eval.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-20.eval.golden index 1dd2b8ed5d3..5b22030ed6b 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-20.eval.golden @@ -1 +1,5 @@ +cpu: 64100 +mem: 500 +size: 4 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-4.budget.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-4.budget.golden deleted file mode 100644 index 5acec6cac96..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 64100 -mem: 500 -size: 4 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-4.eval.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-4.eval.golden index 1dd2b8ed5d3..5b22030ed6b 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext2-4.eval.golden @@ -1 +1,5 @@ +cpu: 64100 +mem: 500 +size: 4 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.budget.golden deleted file mode 100644 index a6335049fb3..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 30182758 -mem: 2102 -size: 29 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.eval.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.eval.golden index 1dd2b8ed5d3..82952529149 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityData-20.eval.golden @@ -1 +1,5 @@ +cpu: 30182758 +mem: 2102 +size: 29 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityOverhead-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityOverhead-20.budget.golden deleted file mode 100644 index f00c3545046..00000000000 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityOverhead-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 112100 -mem: 800 -size: 7 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden index 1dd2b8ed5d3..10c21bf7dcc 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden @@ -1 +1,5 @@ +cpu: 112100 +mem: 800 +size: 7 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Spec.hs b/plutus-benchmark/script-contexts/test/V1/Spec.hs index 8cb761f9a5c..1db9c87e823 100644 --- a/plutus-benchmark/script-contexts/test/V1/Spec.hs +++ b/plutus-benchmark/script-contexts/test/V1/Spec.hs @@ -51,14 +51,10 @@ testCheckSOPSc1 = testGroup "checkScriptContext1" SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext1" $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext1-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-4" $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext1-4" $ - [SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext1-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-20" $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext1-20" $ - [SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 20)] ] ] @@ -72,14 +68,10 @@ testCheckDataSc1 = testGroup "checkScriptContext1" Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext1" $ Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext1-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-4" $ Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext1-4" $ - [Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext1-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-20" $ Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext1-20" $ - [Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 20)] ] ] @@ -93,14 +85,10 @@ testCheckSOPSc2 = testGroup "checkScriptContext2" SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext2" $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext2-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-4" $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext2-4" $ - [SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext2-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-20" $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext2-20" $ - [SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 20)] ] ] @@ -114,40 +102,28 @@ testCheckDataSc2 = testGroup "checkScriptContext2" Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext2" $ Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext2-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-4" $ Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext2-4" $ - [Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext2-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-20" $ Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext2-20" $ - [Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 20)] ] ] testCheckSOPScEquality :: TestTree testCheckSOPScEquality = testGroup "checkScriptContextEquality" - [ runTestGhcSOP [ Tx.goldenBudget "checkScriptContextEqualityData-20" $ + [ runTestGhcSOP [ Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityData-20" $ SOP.SC.mkScriptContextEqualityDataCode (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityData-20" $ - [SOP.SC.mkScriptContextEqualityDataCode (SOP.SC.mkScriptContext 20)] - , Tx.goldenBudget "checkScriptContextEqualityOverhead-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityOverhead-20" $ SOP.SC.mkScriptContextEqualityOverheadCode (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityOverhead-20" $ - [SOP.SC.mkScriptContextEqualityOverheadCode (SOP.SC.mkScriptContext 20)] ] ] testCheckDataScEquality :: TestTree testCheckDataScEquality = testGroup "checkScriptContextEquality" - [ runTestGhcData [ Tx.goldenBudget "checkScriptContextEqualityData-20" $ + [ runTestGhcData [ Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityData-20" $ Data.SC.mkScriptContextEqualityDataCode (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityData-20" $ - [Data.SC.mkScriptContextEqualityDataCode (Data.SC.mkScriptContext 20)] - , Tx.goldenBudget "checkScriptContextEqualityOverhead-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityOverhead-20" $ Data.SC.mkScriptContextEqualityOverheadCode (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityOverhead-20" $ - [Data.SC.mkScriptContextEqualityOverheadCode (Data.SC.mkScriptContext 20)] ] ] diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.budget.golden deleted file mode 100644 index 46a18c3ddb9..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 289927589 -mem: 1089115 -size: 1683 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.eval.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.eval.golden index 1dd2b8ed5d3..f836425fbe3 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.eval.golden @@ -1 +1,5 @@ +cpu: 289927589 +mem: 1089115 +size: 1683 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.budget.golden deleted file mode 100644 index 761b073ec2e..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 82045173 -mem: 312891 -size: 1683 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.eval.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.eval.golden index 1dd2b8ed5d3..b42c02f15b5 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.eval.golden @@ -1 +1,5 @@ +cpu: 82045173 +mem: 312891 +size: 1683 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.budget.golden deleted file mode 100644 index 1642587e75f..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 281515117 -mem: 1050772 -size: 1617 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.eval.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.eval.golden index 1dd2b8ed5d3..d0f69e6a9bc 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.eval.golden @@ -1 +1,5 @@ +cpu: 281515117 +mem: 1050772 +size: 1617 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.budget.golden deleted file mode 100644 index e85b8ac412e..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 79604029 -mem: 301780 -size: 1617 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.eval.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.eval.golden index 1dd2b8ed5d3..d655becfee9 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.eval.golden @@ -1 +1,5 @@ +cpu: 79604029 +mem: 301780 +size: 1617 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.budget.golden deleted file mode 100644 index 9ae44251e07..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 37527310 -mem: 33002 -size: 338 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.eval.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.eval.golden index 1dd2b8ed5d3..26146556af0 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityData-20.eval.golden @@ -1 +1,5 @@ +cpu: 37527310 +mem: 33002 +size: 338 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityOverhead-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityOverhead-20.budget.golden deleted file mode 100644 index 88cbc1ab87b..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityOverhead-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5056100 -mem: 31700 -size: 316 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityOverhead-20.eval.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityOverhead-20.eval.golden index 1dd2b8ed5d3..053f7db3993 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityOverhead-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContextEqualityOverhead-20.eval.golden @@ -1 +1,5 @@ +cpu: 5056100 +mem: 31700 +size: 316 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.budget.golden deleted file mode 100644 index bfd09618492..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5890120 -mem: 10880 -size: 170 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.eval.golden b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.eval.golden index 1dd2b8ed5d3..2c95205b587 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrick.eval.golden @@ -1 +1,5 @@ +cpu: 5890120 +mem: 10880 +size: 170 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.budget.golden deleted file mode 100644 index 8c7750396f8..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 6082120 -mem: 12080 -size: 186 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.eval.golden b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.eval.golden index 1dd2b8ed5d3..4975fff1a05 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/dataFwdStakeTrickManual.eval.golden @@ -1 +1,5 @@ +cpu: 6082120 +mem: 12080 +size: 186 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.budget.golden deleted file mode 100644 index 70866726319..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 364372993 -mem: 1352932 -size: 1861 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.eval.golden b/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.eval.golden index 1dd2b8ed5d3..e75cc9ae414 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/sopFwdStakeTrick.eval.golden @@ -1 +1,5 @@ +cpu: 364372993 +mem: 1352932 +size: 1861 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.budget.golden deleted file mode 100644 index e1c85fc8431..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 20406425 -mem: 73283 -size: 99 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.eval.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.eval.golden index 1dd2b8ed5d3..9aaac655fa3 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.eval.golden @@ -1 +1,5 @@ +cpu: 20406425 +mem: 73283 +size: 99 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.budget.golden deleted file mode 100644 index 7bb87062e58..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5830185 -mem: 20515 -size: 99 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.eval.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.eval.golden index 1dd2b8ed5d3..f87225ce4e2 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.eval.golden @@ -1 +1,5 @@ +cpu: 5830185 +mem: 20515 +size: 99 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-20.budget.golden deleted file mode 100644 index 5acec6cac96..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 64100 -mem: 500 -size: 4 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-20.eval.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-20.eval.golden index 1dd2b8ed5d3..5b22030ed6b 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-20.eval.golden @@ -1 +1,5 @@ +cpu: 64100 +mem: 500 +size: 4 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-4.budget.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-4.budget.golden deleted file mode 100644 index 5acec6cac96..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 64100 -mem: 500 -size: 4 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-4.eval.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-4.eval.golden index 1dd2b8ed5d3..5b22030ed6b 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext2-4.eval.golden @@ -1 +1,5 @@ +cpu: 64100 +mem: 500 +size: 4 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.budget.golden deleted file mode 100644 index 3c21ed91750..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 32583310 -mem: 2102 -size: 29 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.eval.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.eval.golden index 1dd2b8ed5d3..552b725bbb6 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityData-20.eval.golden @@ -1 +1,5 @@ +cpu: 32583310 +mem: 2102 +size: 29 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityOverhead-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityOverhead-20.budget.golden deleted file mode 100644 index f00c3545046..00000000000 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityOverhead-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 112100 -mem: 800 -size: 7 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden index 1dd2b8ed5d3..10c21bf7dcc 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden @@ -1 +1,5 @@ +cpu: 112100 +mem: 800 +size: 7 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Spec.hs b/plutus-benchmark/script-contexts/test/V2/Spec.hs index 4dd0c7c7039..625690047df 100644 --- a/plutus-benchmark/script-contexts/test/V2/Spec.hs +++ b/plutus-benchmark/script-contexts/test/V2/Spec.hs @@ -55,14 +55,10 @@ testCheckSOPSc1 = testGroup "checkScriptContext1" SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext1" $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext1-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-4" $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext1-4" $ - [SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext1-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-20" $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext1-20" $ - [SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 20)] ] ] @@ -76,14 +72,10 @@ testCheckDataSc1 = testGroup "checkScriptContext1" Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext1" $ Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext1-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-4" $ Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext1-4" $ - [Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext1-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-20" $ Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext1-20" $ - [Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 20)] ] ] @@ -97,14 +89,10 @@ testCheckSOPSc2 = testGroup "checkScriptContext2" SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext2" $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext2-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-4" $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext2-4" $ - [SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext2-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-20" $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext2-20" $ - [SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 20)] ] ] @@ -118,40 +106,28 @@ testCheckDataSc2 = testGroup "checkScriptContext2" Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext2" $ Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext2-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-4" $ Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext2-4" $ - [Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext2-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-20" $ Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext2-20" $ - [Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 20)] ] ] testCheckSOPScEquality :: TestTree testCheckSOPScEquality = testGroup "checkScriptContextEquality" - [ runTestGhcSOP [ Tx.goldenBudget "checkScriptContextEqualityData-20" $ + [ runTestGhcSOP [ Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityData-20" $ SOP.SC.mkScriptContextEqualityDataCode (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityData-20" $ - [SOP.SC.mkScriptContextEqualityDataCode (SOP.SC.mkScriptContext 20)] - , Tx.goldenBudget "checkScriptContextEqualityOverhead-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityOverhead-20" $ SOP.SC.mkScriptContextEqualityOverheadCode (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityOverhead-20" $ - [SOP.SC.mkScriptContextEqualityOverheadCode (SOP.SC.mkScriptContext 20)] ] ] testCheckDataScEquality :: TestTree testCheckDataScEquality = testGroup "checkScriptContextEquality" - [ runTestGhcData [ Tx.goldenBudget "checkScriptContextEqualityData-20" $ + [ runTestGhcData [ Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityData-20" $ Data.SC.mkScriptContextEqualityDataCode (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityData-20" $ - [Data.SC.mkScriptContextEqualityDataCode (Data.SC.mkScriptContext 20)] - , Tx.goldenBudget "checkScriptContextEqualityOverhead-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityOverhead-20" $ Data.SC.mkScriptContextEqualityOverheadCode (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityOverhead-20" $ - [Data.SC.mkScriptContextEqualityOverheadCode (Data.SC.mkScriptContext 20)] ] ] @@ -160,8 +136,7 @@ testSOPFwdStakeTrick = runTestGhcSOP [ Tx.goldenPirReadable "sopFwdStakeTrick" testAbsCode , Tx.goldenUPlcReadable "sopFwdStakeTrick" testAbsCode - , Tx.goldenBudget "sopFwdStakeTrick" testCode - , Tx.goldenEvalCekCatch "sopFwdStakeTrick" [testCode] + , Tx.goldenEvalCekCatchBudget "sopFwdStakeTrick" testCode ] where testCredential = @@ -178,8 +153,7 @@ testDataFwdStakeTrick = runTestGhcSOP [ Tx.goldenPirReadable "dataFwdStakeTrick" testAbsCode , Tx.goldenUPlcReadable "dataFwdStakeTrick" testAbsCode - , Tx.goldenBudget "dataFwdStakeTrick" testCode - , Tx.goldenEvalCekCatch "dataFwdStakeTrick" [testCode] + , Tx.goldenEvalCekCatchBudget "dataFwdStakeTrick" testCode ] where testCredential = @@ -196,8 +170,7 @@ testDataFwdStakeTrickManual = runTestGhcSOP [ Tx.goldenPirReadable "dataFwdStakeTrickManual" testAbsCode , Tx.goldenUPlcReadable "dataFwdStakeTrickManual" testAbsCode - , Tx.goldenBudget "dataFwdStakeTrickManual" testCode - , Tx.goldenEvalCekCatch "dataFwdStakeTrickManual" [testCode] + , Tx.goldenEvalCekCatchBudget "dataFwdStakeTrickManual" testCode ] where testCredential = diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.budget.golden deleted file mode 100644 index eea702a32f9..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 293286695 -mem: 1101629 -size: 3086 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.eval.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.eval.golden index 1dd2b8ed5d3..2867e9de8d7 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.eval.golden @@ -1 +1,5 @@ +cpu: 293286695 +mem: 1101629 +size: 3086 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.budget.golden deleted file mode 100644 index 1637d917082..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 86172279 -mem: 330205 -size: 3086 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.eval.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.eval.golden index 1dd2b8ed5d3..0d13e7ff448 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.eval.golden @@ -1 +1,5 @@ +cpu: 86172279 +mem: 330205 +size: 3086 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.budget.golden deleted file mode 100644 index fc9baa67b39..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 285706223 -mem: 1068486 -size: 3015 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.eval.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.eval.golden index 1dd2b8ed5d3..c36d589900a 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.eval.golden @@ -1 +1,5 @@ +cpu: 285706223 +mem: 1068486 +size: 3015 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.budget.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.budget.golden deleted file mode 100644 index aa1764478b7..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 83795135 -mem: 319494 -size: 3015 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.eval.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.eval.golden index 1dd2b8ed5d3..3f6fafc9527 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.eval.golden @@ -1 +1,5 @@ +cpu: 83795135 +mem: 319494 +size: 3015 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.budget.golden deleted file mode 100644 index f8e56fc0ea2..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 38114332 -mem: 33602 -size: 344 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.eval.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.eval.golden index 1dd2b8ed5d3..c93832de255 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityData-20.eval.golden @@ -1 +1,5 @@ +cpu: 38114332 +mem: 33602 +size: 344 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityOverhead-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityOverhead-20.budget.golden deleted file mode 100644 index dc1fc287951..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityOverhead-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5152100 -mem: 32300 -size: 322 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityOverhead-20.eval.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityOverhead-20.eval.golden index 1dd2b8ed5d3..c5e93828d64 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityOverhead-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContextEqualityOverhead-20.eval.golden @@ -1 +1,5 @@ +cpu: 5152100 +mem: 32300 +size: 322 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.budget.golden deleted file mode 100644 index e1c85fc8431..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 20406425 -mem: 73283 -size: 99 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.eval.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.eval.golden index 1dd2b8ed5d3..9aaac655fa3 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.eval.golden @@ -1 +1,5 @@ +cpu: 20406425 +mem: 73283 +size: 99 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.budget.golden deleted file mode 100644 index 7bb87062e58..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5830185 -mem: 20515 -size: 99 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.eval.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.eval.golden index 1dd2b8ed5d3..f87225ce4e2 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.eval.golden @@ -1 +1,5 @@ +cpu: 5830185 +mem: 20515 +size: 99 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-20.budget.golden deleted file mode 100644 index 5acec6cac96..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 64100 -mem: 500 -size: 4 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-20.eval.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-20.eval.golden index 1dd2b8ed5d3..5b22030ed6b 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-20.eval.golden @@ -1 +1,5 @@ +cpu: 64100 +mem: 500 +size: 4 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-4.budget.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-4.budget.golden deleted file mode 100644 index 5acec6cac96..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 64100 -mem: 500 -size: 4 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-4.eval.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-4.eval.golden index 1dd2b8ed5d3..5b22030ed6b 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext2-4.eval.golden @@ -1 +1,5 @@ +cpu: 64100 +mem: 500 +size: 4 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.budget.golden deleted file mode 100644 index cfd5249025b..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 33074332 -mem: 2102 -size: 29 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.eval.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.eval.golden index 1dd2b8ed5d3..fc46f9c7f0a 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityData-20.eval.golden @@ -1 +1,5 @@ +cpu: 33074332 +mem: 2102 +size: 29 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityOverhead-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityOverhead-20.budget.golden deleted file mode 100644 index f00c3545046..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityOverhead-20.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 112100 -mem: 800 -size: 7 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden index 1dd2b8ed5d3..10c21bf7dcc 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContextEqualityOverhead-20.eval.golden @@ -1 +1,5 @@ +cpu: 112100 +mem: 800 +size: 7 + (constr 0) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.budget.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.budget.golden deleted file mode 100644 index 35f36a0d4ff..00000000000 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 62511735 -mem: 287696 -size: 2508 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.eval.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.eval.golden index 4d205aa4e2b..90d35474d05 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.eval.golden +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/purposeIsWellFormed-4.eval.golden @@ -1 +1,5 @@ +cpu: 62511735 +mem: 287696 +size: 2508 + (con unit ()) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Spec.hs b/plutus-benchmark/script-contexts/test/V3/Spec.hs index 74b2aee8ecc..38f2cf7696c 100644 --- a/plutus-benchmark/script-contexts/test/V3/Spec.hs +++ b/plutus-benchmark/script-contexts/test/V3/Spec.hs @@ -51,14 +51,10 @@ testCheckSOPSc1 = testGroup "checkScriptContext1" SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext1" $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext1-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-4" $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext1-4" $ - [SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext1-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-20" $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext1-20" $ - [SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 20)] ] ] @@ -72,14 +68,10 @@ testCheckDataSc1 = testGroup "checkScriptContext1" Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext1" $ Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext1-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-4" $ Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext1-4" $ - [Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext1-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext1-20" $ Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext1-20" $ - [Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 20)] ] ] @@ -93,14 +85,10 @@ testCheckSOPSc2 = testGroup "checkScriptContext2" SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext2" $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext2-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-4" $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext2-4" $ - [SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext2-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-20" $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext2-20" $ - [SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 20)] ] ] @@ -114,40 +102,28 @@ testCheckDataSc2 = testGroup "checkScriptContext2" Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 1) , Tx.goldenPirReadable "checkScriptContext2" $ Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 1) - , Tx.goldenBudget "checkScriptContext2-4" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-4" $ Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 4) - , Tx.goldenEvalCekCatch "checkScriptContext2-4" $ - [Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 4)] - , Tx.goldenBudget "checkScriptContext2-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContext2-20" $ Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContext2-20" $ - [Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 20)] ] ] testCheckSOPScEquality :: TestTree testCheckSOPScEquality = testGroup "checkScriptContextEquality" - [ runTestGhcSOP [ Tx.goldenBudget "checkScriptContextEqualityData-20" $ + [ runTestGhcSOP [ Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityData-20" $ SOP.SC.mkScriptContextEqualityDataCode (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityData-20" $ - [SOP.SC.mkScriptContextEqualityDataCode (SOP.SC.mkScriptContext 20)] - , Tx.goldenBudget "checkScriptContextEqualityOverhead-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityOverhead-20" $ SOP.SC.mkScriptContextEqualityOverheadCode (SOP.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityOverhead-20" $ - [SOP.SC.mkScriptContextEqualityOverheadCode (SOP.SC.mkScriptContext 20)] ] ] testCheckDataScEquality :: TestTree testCheckDataScEquality = testGroup "checkScriptContextEquality" - [ runTestGhcData [ Tx.goldenBudget "checkScriptContextEqualityData-20" $ + [ runTestGhcData [ Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityData-20" $ Data.SC.mkScriptContextEqualityDataCode (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityData-20" $ - [Data.SC.mkScriptContextEqualityDataCode (Data.SC.mkScriptContext 20)] - , Tx.goldenBudget "checkScriptContextEqualityOverhead-20" $ + , Tx.goldenEvalCekCatchBudget "checkScriptContextEqualityOverhead-20" $ Data.SC.mkScriptContextEqualityOverheadCode (Data.SC.mkScriptContext 20) - , Tx.goldenEvalCekCatch "checkScriptContextEqualityOverhead-20" $ - [Data.SC.mkScriptContextEqualityOverheadCode (Data.SC.mkScriptContext 20)] ] ] @@ -155,12 +131,10 @@ testPurposeIsWellFormed :: TestTree testPurposeIsWellFormed = testGroup "purposeIsWellFormed" [ runTestGhcData [ Tx.goldenPirReadable "purposeIsWellFormed" $ Data.SC.compiledPurposeIsWellFormed - , Tx.goldenSize "purposeIsWellFormed" $ + , Tx.goldenSize "purposeIsWellFormed" $ Data.SC.compiledPurposeIsWellFormed - , Tx.goldenBudget "purposeIsWellFormed-4" $ + , Tx.goldenEvalCekCatchBudget "purposeIsWellFormed-4" $ Data.SC.mkPurposeIsWellFormedCode (Data.SC.mkMintingScriptContext 4) - , Tx.goldenEvalCekCatch "purposeIsWellFormed-4" - [Data.SC.mkPurposeIsWellFormedCode (Data.SC.mkMintingScriptContext 4)] ] ] diff --git a/plutus-ledger-api/test-plugin/Spec/Budget.hs b/plutus-ledger-api/test-plugin/Spec/Budget.hs index 62ad9a95681..5bf4bc456d3 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget.hs +++ b/plutus-ledger-api/test-plugin/Spec/Budget.hs @@ -34,9 +34,7 @@ tests = ] ++ concatMap ( \(TestCase name code) -> - [ goldenBudget name code - , goldenEvalCekCatch name [code] - ] + [ goldenEvalCekCatchBudget name code ] ) testCases diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.budget.golden deleted file mode 100644 index 597529d74a8..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 8088858 -mem: 42924 -size: 186 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.eval.golden index 63195b8553f..5844d2a0bcd 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.eval.golden @@ -1 +1,5 @@ +cpu: 8088858 +mem: 42924 +size: 186 + (con integer 3636) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.budget.golden deleted file mode 100644 index 1124da6881a..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 118186685 -mem: 661630 -size: 611 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.eval.golden index 1dd2b8ed5d3..e04e5e954b1 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.eval.golden @@ -1 +1,5 @@ +cpu: 118186685 +mem: 661630 +size: 611 + (constr 0) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.budget.golden deleted file mode 100644 index c7eb0db7072..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 126563949 -mem: 709942 -size: 639 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.eval.golden index f217693e82c..f9f6d431dbf 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.eval.golden @@ -1 +1,5 @@ +cpu: 126563949 +mem: 709942 +size: 639 + (constr 1) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.budget.golden deleted file mode 100644 index 78ce0f0e4f0..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 130466644 -mem: 730552 -size: 639 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.eval.golden index 1dd2b8ed5d3..f096d4ba3c9 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.eval.golden @@ -1 +1,5 @@ +cpu: 130466644 +mem: 730552 +size: 639 + (constr 0) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.budget.golden deleted file mode 100644 index 8eb6a88c2e8..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 113756728 -mem: 638020 -size: 615 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.eval.golden index f217693e82c..6387ea08fe5 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.eval.golden @@ -1 +1,5 @@ +cpu: 113756728 +mem: 638020 +size: 615 + (constr 1) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.budget.golden deleted file mode 100644 index 698556064d2..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 121872779 -mem: 681938 -size: 615 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.eval.golden index 1dd2b8ed5d3..fe177411181 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.eval.golden @@ -1 +1,5 @@ +cpu: 121872779 +mem: 681938 +size: 615 + (constr 0) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.budget.golden deleted file mode 100644 index 599f8897c41..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 148560115 -mem: 826300 -size: 979 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.eval.golden index f217693e82c..904a0975b50 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.eval.golden @@ -1 +1,5 @@ +cpu: 148560115 +mem: 826300 +size: 979 + (constr 1) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.budget.golden deleted file mode 100644 index cc2de34c64c..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 125187949 -mem: 701342 -size: 1007 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.eval.golden index f217693e82c..b41adf4d5f7 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.eval.golden @@ -1 +1,5 @@ +cpu: 125187949 +mem: 701342 +size: 1007 + (constr 1) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.budget.golden deleted file mode 100644 index 1d07b12f603..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 161112456 -mem: 896124 -size: 1007 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.eval.golden index 1dd2b8ed5d3..c291a08f976 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.eval.golden @@ -1 +1,5 @@ +cpu: 161112456 +mem: 896124 +size: 1007 + (constr 0) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.budget.golden deleted file mode 100644 index 680eac3c7cb..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 113244728 -mem: 634820 -size: 983 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.eval.golden index f217693e82c..a428a953bbf 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.eval.golden @@ -1 +1,5 @@ +cpu: 113244728 +mem: 634820 +size: 983 + (constr 1) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.budget.golden deleted file mode 100644 index d80ce173af6..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 135849718 -mem: 757770 -size: 983 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.eval.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.eval.golden index 1dd2b8ed5d3..e1aeb6d75c5 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.eval.golden @@ -1 +1,5 @@ +cpu: 135849718 +mem: 757770 +size: 983 + (constr 0) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget.hs b/plutus-ledger-api/test-plugin/Spec/Data/Budget.hs index cb536f05ba7..0ab9f4bb0ab 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget.hs +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget.hs @@ -33,8 +33,7 @@ tests = ] ++ concatMap ( \(TestCase name code) -> - [ goldenBudget name code - , goldenEvalCekCatch name [code] + [ goldenEvalCekCatchBudget name code ] ) testCases diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.budget.golden deleted file mode 100644 index 167dade4feb..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 22759162 -mem: 63080 -size: 112 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.eval.golden index 63195b8553f..e49b59220ed 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.eval.golden @@ -1 +1,5 @@ +cpu: 22759162 +mem: 63080 +size: 112 + (con integer 3636) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.budget.golden deleted file mode 100644 index 3e5fdd29368..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 613090560 -mem: 1824850 -size: 764 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.eval.golden index 1dd2b8ed5d3..2ca56f0b63d 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.eval.golden @@ -1 +1,5 @@ +cpu: 613090560 +mem: 1824850 +size: 764 + (constr 0) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.budget.golden deleted file mode 100644 index 904fdeca380..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 647706509 -mem: 1941370 -size: 764 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.eval.golden index f217693e82c..b04baf1e4a7 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.eval.golden @@ -1 +1,5 @@ +cpu: 647706509 +mem: 1941370 +size: 764 + (constr 1) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.budget.golden deleted file mode 100644 index 470d27e210e..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 677017054 -mem: 2036956 -size: 764 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.eval.golden index 1dd2b8ed5d3..28272ea04db 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.eval.golden @@ -1 +1,5 @@ +cpu: 677017054 +mem: 2036956 +size: 764 + (constr 0) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.budget.golden deleted file mode 100644 index 27a7b07bf45..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 587374155 -mem: 1714642 -size: 764 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.eval.golden index f217693e82c..f895263f24a 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.eval.golden @@ -1 +1,5 @@ +cpu: 587374155 +mem: 1714642 +size: 764 + (constr 1) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.budget.golden deleted file mode 100644 index 92718eb91ba..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 635615047 -mem: 1890258 -size: 764 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.eval.golden index 1dd2b8ed5d3..f0dbc512a78 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.eval.golden @@ -1 +1,5 @@ +cpu: 635615047 +mem: 1890258 +size: 764 + (constr 0) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.budget.golden deleted file mode 100644 index d200e9f9127..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 713536368 -mem: 2149084 -size: 1227 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.eval.golden index f217693e82c..8ea30d4369c 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.eval.golden @@ -1 +1,5 @@ +cpu: 713536368 +mem: 2149084 +size: 1227 + (constr 1) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.budget.golden deleted file mode 100644 index 15499e89fa2..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 646378509 -mem: 1933070 -size: 1227 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.eval.golden index f217693e82c..4df27d5808b 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.eval.golden @@ -1 +1,5 @@ +cpu: 646378509 +mem: 1933070 +size: 1227 + (constr 1) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.budget.golden deleted file mode 100644 index 7f4878b993c..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 779961022 -mem: 2369576 -size: 1227 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.eval.golden index 1dd2b8ed5d3..2d0e4f13c19 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.eval.golden @@ -1 +1,5 @@ +cpu: 779961022 +mem: 2369576 +size: 1227 + (constr 0) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.budget.golden deleted file mode 100644 index c588ac83f16..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 586910155 -mem: 1711742 -size: 1227 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.eval.golden index f217693e82c..56d873c6bd5 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.eval.golden @@ -1 +1,5 @@ +cpu: 586910155 +mem: 1711742 +size: 1227 + (constr 1) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.budget.golden deleted file mode 100644 index 4f7317c83f7..00000000000 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 682511527 -mem: 2042362 -size: 1227 \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.eval.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.eval.golden index 1dd2b8ed5d3..820e0d6c9dd 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.eval.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.eval.golden @@ -1 +1,5 @@ +cpu: 682511527 +mem: 2042362 +size: 1227 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/plutus-tx-plugin.cabal b/plutus-tx-plugin/plutus-tx-plugin.cabal index b4180359ca9..c4d1a0f73d3 100644 --- a/plutus-tx-plugin/plutus-tx-plugin.cabal +++ b/plutus-tx-plugin/plutus-tx-plugin.cabal @@ -141,7 +141,6 @@ test-suite plutus-tx-plugin-tests IntegerLiterals.Strict.NegativeLiterals.Spec IntegerLiterals.Strict.NoNegativeLiterals.Spec IsData.Spec - Lib Lift.Spec List.Properties1 List.Properties2 diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.budget.golden deleted file mode 100644 index e6d23559934..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 7305268 -mem: 26325 -size: 220 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.eval.golden index 29ee9571e9f..ef9731bef14 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum-manual.eval.golden @@ -1 +1,5 @@ +cpu: 7305268 +mem: 26325 +size: 220 + (con data (Constr 0 [I 20, I 40, I 60, I 80])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.budget.golden deleted file mode 100644 index 19dff4a802d..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 7405601 -mem: 26626 -size: 231 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.eval.golden index 29ee9571e9f..56c3db1388f 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/destructSum.eval.golden @@ -1 +1,5 @@ +cpu: 7405601 +mem: 26626 +size: 231 + (con data (Constr 0 [I 20, I 40, I 60, I 80])) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once-applied.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once-applied.budget.golden deleted file mode 100644 index 8efc3a40af5..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once-applied.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 965630 -mem: 3110 -size: 30 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once-applied.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once-applied.eval.golden index b218a46b8d0..0451e967a85 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once-applied.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once-applied.eval.golden @@ -1 +1,5 @@ +cpu: 965630 +mem: 3110 +size: 30 + (con integer 48) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once.budget.golden deleted file mode 100644 index 8efc3a40af5..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 965630 -mem: 3110 -size: 30 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once.eval.golden index b218a46b8d0..0451e967a85 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/inline-once.eval.golden @@ -1 +1,5 @@ +cpu: 965630 +mem: 3110 +size: 30 + (con integer 48) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-twice.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/inline-twice.budget.golden deleted file mode 100644 index 8efc3a40af5..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-twice.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 965630 -mem: 3110 -size: 30 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-twice.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/inline-twice.eval.golden index b218a46b8d0..0451e967a85 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/inline-twice.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/inline-twice.eval.golden @@ -1 +1,5 @@ +cpu: 965630 +mem: 3110 +size: 30 + (con integer 48) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/inlineLocalOnce.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/inlineLocalOnce.budget.golden deleted file mode 100644 index 73b5051284e..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/inlineLocalOnce.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 597469 -mem: 2006 -size: 19 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/inlineLocalOnce.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/inlineLocalOnce.eval.golden index 5d567372f2a..b3188d326a4 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/inlineLocalOnce.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/inlineLocalOnce.eval.golden @@ -1 +1,5 @@ +cpu: 597469 +mem: 2006 +size: 19 + (con integer 12) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/noinline.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/noinline.budget.golden deleted file mode 100644 index 8efc3a40af5..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/noinline.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 965630 -mem: 3110 -size: 30 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/noinline.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/noinline.eval.golden index b218a46b8d0..0451e967a85 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/noinline.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/noinline.eval.golden @@ -1 +1,5 @@ +cpu: 965630 +mem: 3110 +size: 30 + (con integer 48) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.budget.golden deleted file mode 100644 index 96ac69d2793..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 510574 -mem: 1728 -size: 15 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.eval.golden index 3df7275df82..6666243bea7 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField-manual.eval.golden @@ -1 +1,5 @@ +cpu: 510574 +mem: 1728 +size: 15 + (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.budget.golden deleted file mode 100644 index 96ac69d2793..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 510574 -mem: 1728 -size: 15 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.eval.golden index 3df7275df82..6666243bea7 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/onlyUseFirstField.eval.golden @@ -1 +1,5 @@ +cpu: 510574 +mem: 1728 +size: 15 + (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.budget.golden deleted file mode 100644 index 918425fe8d2..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 4567211 -mem: 15442 -size: 148 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.eval.golden index 2a6201e818b..88606c1f502 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/patternMatching.eval.golden @@ -1 +1,5 @@ +cpu: 4567211 +mem: 15442 +size: 148 + (con integer 220) \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.budget.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.budget.golden deleted file mode 100644 index 25e1b0c3a2c..00000000000 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 10360646 -mem: 37390 -size: 197 \ No newline at end of file diff --git a/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.eval.golden b/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.eval.golden index 2a6201e818b..f81d5ef0056 100644 --- a/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.eval.golden +++ b/plutus-tx-plugin/test/AsData/Budget/9.6/recordFields.eval.golden @@ -1 +1,5 @@ +cpu: 10360646 +mem: 37390 +size: 197 + (con integer 220) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/allCheap.budget.golden deleted file mode 100644 index 2801f4ce9ea..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/allCheap.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 903986 -mem: 5002 -size: 56 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allCheap.eval.golden b/plutus-tx-plugin/test/Budget/9.6/allCheap.eval.golden index f217693e82c..611215078a7 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allCheap.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/allCheap.eval.golden @@ -1 +1,5 @@ +cpu: 903986 +mem: 5002 +size: 56 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.budget.golden b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.budget.golden deleted file mode 100644 index 59f433cc26c..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 224100 -mem: 1500 -size: 36 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.eval.golden b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.eval.golden index 1dd2b8ed5d3..0fb25f64bea 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.eval.golden @@ -1 +1,5 @@ +cpu: 224100 +mem: 1500 +size: 36 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/allExpensive.budget.golden deleted file mode 100644 index e721772c369..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/allExpensive.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5742960 -mem: 28520 -size: 56 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allExpensive.eval.golden b/plutus-tx-plugin/test/Budget/9.6/allExpensive.eval.golden index 1dd2b8ed5d3..2e3801a1c7d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allExpensive.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/allExpensive.eval.golden @@ -1 +1,5 @@ +cpu: 5742960 +mem: 28520 +size: 56 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/andCheap.budget.golden deleted file mode 100644 index c899c557111..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/andCheap.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 640100 -mem: 4100 -size: 48 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andCheap.eval.golden b/plutus-tx-plugin/test/Budget/9.6/andCheap.eval.golden index f217693e82c..7a8e7960004 100644 --- a/plutus-tx-plugin/test/Budget/9.6/andCheap.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/andCheap.eval.golden @@ -1 +1,5 @@ +cpu: 640100 +mem: 4100 +size: 48 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/andExpensive.budget.golden deleted file mode 100644 index 6bd49e54064..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/andExpensive.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 3104100 -mem: 19500 -size: 48 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andExpensive.eval.golden b/plutus-tx-plugin/test/Budget/9.6/andExpensive.eval.golden index 1dd2b8ed5d3..5f522a5c879 100644 --- a/plutus-tx-plugin/test/Budget/9.6/andExpensive.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/andExpensive.eval.golden @@ -1 +1,5 @@ +cpu: 3104100 +mem: 19500 +size: 48 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andWithGHCOpts.budget.golden b/plutus-tx-plugin/test/Budget/9.6/andWithGHCOpts.budget.golden deleted file mode 100644 index 3aa37cefa4a..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/andWithGHCOpts.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 441439 -mem: 2102 -size: 32 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andWithGHCOpts.eval.golden b/plutus-tx-plugin/test/Budget/9.6/andWithGHCOpts.eval.golden index f217693e82c..644e6952ca2 100644 --- a/plutus-tx-plugin/test/Budget/9.6/andWithGHCOpts.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/andWithGHCOpts.eval.golden @@ -1 +1,5 @@ +cpu: 441439 +mem: 2102 +size: 32 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andWithLocal.budget.golden b/plutus-tx-plugin/test/Budget/9.6/andWithLocal.budget.golden deleted file mode 100644 index 589783f4399..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/andWithLocal.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 617439 -mem: 3202 -size: 37 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andWithLocal.eval.golden b/plutus-tx-plugin/test/Budget/9.6/andWithLocal.eval.golden index f217693e82c..2874d8a6fc9 100644 --- a/plutus-tx-plugin/test/Budget/9.6/andWithLocal.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/andWithLocal.eval.golden @@ -1 +1,5 @@ +cpu: 617439 +mem: 3202 +size: 37 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.budget.golden b/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.budget.golden deleted file mode 100644 index d2386a37f76..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 473439 -mem: 2302 -size: 35 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.eval.golden b/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.eval.golden index f217693e82c..63273f05eb6 100644 --- a/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/andWithoutGHCOpts.eval.golden @@ -1 +1,5 @@ +cpu: 473439 +mem: 2302 +size: 35 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/anyCheap.budget.golden deleted file mode 100644 index 2801f4ce9ea..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/anyCheap.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 903986 -mem: 5002 -size: 56 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyCheap.eval.golden b/plutus-tx-plugin/test/Budget/9.6/anyCheap.eval.golden index 1dd2b8ed5d3..ce4e6eb8860 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyCheap.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/anyCheap.eval.golden @@ -1 +1,5 @@ +cpu: 903986 +mem: 5002 +size: 56 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.budget.golden b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.budget.golden deleted file mode 100644 index 59f433cc26c..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 224100 -mem: 1500 -size: 36 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.eval.golden b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.eval.golden index f217693e82c..0daa2a80cb7 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.eval.golden @@ -1 +1,5 @@ +cpu: 224100 +mem: 1500 +size: 36 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.budget.golden deleted file mode 100644 index e721772c369..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5742960 -mem: 28520 -size: 56 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.eval.golden b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.eval.golden index f217693e82c..f891c6434bb 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.eval.golden @@ -1 +1,5 @@ +cpu: 5742960 +mem: 28520 +size: 56 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/applicative.budget.golden b/plutus-tx-plugin/test/Budget/9.6/applicative.budget.golden deleted file mode 100644 index 1829729d6af..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/applicative.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 197308 -mem: 702 -size: 6 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/applicative.eval.golden b/plutus-tx-plugin/test/Budget/9.6/applicative.eval.golden index 13675c87619..baf41c73511 100644 --- a/plutus-tx-plugin/test/Budget/9.6/applicative.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/applicative.eval.golden @@ -1 +1,5 @@ +cpu: 197308 +mem: 702 +size: 6 + (constr 0 (con integer 3)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constAccL.budget.golden b/plutus-tx-plugin/test/Budget/9.6/constAccL.budget.golden deleted file mode 100644 index 36b9f63789c..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/constAccL.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 909933986 -mem: 4308602 -size: 69 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constAccL.eval.golden b/plutus-tx-plugin/test/Budget/9.6/constAccL.eval.golden index 2bfb66d0059..0e992837b8c 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constAccL.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constAccL.eval.golden @@ -1 +1,5 @@ +cpu: 909933986 +mem: 4308602 +size: 69 + (con integer 42) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constAccR.budget.golden b/plutus-tx-plugin/test/Budget/9.6/constAccR.budget.golden deleted file mode 100644 index ae4aae3f27f..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/constAccR.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 861789986 -mem: 4007702 -size: 58 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constAccR.eval.golden b/plutus-tx-plugin/test/Budget/9.6/constAccR.eval.golden index 2bfb66d0059..9af83577e93 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constAccR.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constAccR.eval.golden @@ -1 +1,5 @@ +cpu: 861789986 +mem: 4007702 +size: 58 + (con integer 42) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constElL.budget.golden b/plutus-tx-plugin/test/Budget/9.6/constElL.budget.golden deleted file mode 100644 index 36b9f63789c..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/constElL.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 909933986 -mem: 4308602 -size: 69 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constElL.eval.golden b/plutus-tx-plugin/test/Budget/9.6/constElL.eval.golden index 132831f390c..9d6a8028d52 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constElL.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constElL.eval.golden @@ -1 +1,5 @@ +cpu: 909933986 +mem: 4308602 +size: 69 + (con integer 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constElR.budget.golden b/plutus-tx-plugin/test/Budget/9.6/constElR.budget.golden deleted file mode 100644 index 5d0e5485d2a..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/constElR.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 909789986 -mem: 4307702 -size: 61 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constElR.eval.golden b/plutus-tx-plugin/test/Budget/9.6/constElR.eval.golden index 132831f390c..ff153f84d8c 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constElR.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constElR.eval.golden @@ -1 +1,5 @@ +cpu: 909789986 +mem: 4307702 +size: 61 + (con integer 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/elemCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/elemCheap.budget.golden deleted file mode 100644 index 3e91e0d581b..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/elemCheap.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 912482 -mem: 5002 -size: 56 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/elemCheap.eval.golden b/plutus-tx-plugin/test/Budget/9.6/elemCheap.eval.golden index 1dd2b8ed5d3..2e852b57da6 100644 --- a/plutus-tx-plugin/test/Budget/9.6/elemCheap.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/elemCheap.eval.golden @@ -1 +1,5 @@ +cpu: 912482 +mem: 5002 +size: 56 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/elemExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/elemExpensive.budget.golden deleted file mode 100644 index 06ad5d125e6..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/elemExpensive.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5827920 -mem: 28520 -size: 56 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/elemExpensive.eval.golden b/plutus-tx-plugin/test/Budget/9.6/elemExpensive.eval.golden index f217693e82c..ad440b2cca9 100644 --- a/plutus-tx-plugin/test/Budget/9.6/elemExpensive.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/elemExpensive.eval.golden @@ -1 +1,5 @@ +cpu: 5827920 +mem: 28520 +size: 56 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/filter.budget.golden b/plutus-tx-plugin/test/Budget/9.6/filter.budget.golden deleted file mode 100644 index 82a8926be64..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/filter.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 8427220 -mem: 36530 -size: 65 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/filter.eval.golden b/plutus-tx-plugin/test/Budget/9.6/filter.eval.golden index 9126b5db096..6d0ebf70651 100644 --- a/plutus-tx-plugin/test/Budget/9.6/filter.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/filter.eval.golden @@ -1,3 +1,7 @@ +cpu: 8427220 +mem: 36530 +size: 65 + (constr 1 (con integer 2) diff --git a/plutus-tx-plugin/test/Budget/9.6/findCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findCheap.budget.golden deleted file mode 100644 index e584bb6caef..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/findCheap.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 919986 -mem: 5102 -size: 57 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findCheap.eval.golden b/plutus-tx-plugin/test/Budget/9.6/findCheap.eval.golden index 005b0a452f3..b89bd002de1 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findCheap.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findCheap.eval.golden @@ -1 +1,5 @@ +cpu: 919986 +mem: 5102 +size: 57 + (constr 0 (con integer 1)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.budget.golden deleted file mode 100644 index f89eda219fb..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 224100 -mem: 1500 -size: 37 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.eval.golden b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.eval.golden index f217693e82c..dfaba4052db 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.eval.golden @@ -1 +1,5 @@ +cpu: 224100 +mem: 1500 +size: 37 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findExpensive.budget.golden deleted file mode 100644 index a4497975255..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/findExpensive.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5742960 -mem: 28520 -size: 57 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findExpensive.eval.golden b/plutus-tx-plugin/test/Budget/9.6/findExpensive.eval.golden index f217693e82c..250a1fbb9bd 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findExpensive.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findExpensive.eval.golden @@ -1 +1,5 @@ +cpu: 5742960 +mem: 28520 +size: 57 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.budget.golden deleted file mode 100644 index beafd92aa7e..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 967986 -mem: 5402 -size: 69 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.eval.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.eval.golden index 6b97e805298..4efff4ebe56 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.eval.golden @@ -1 +1,5 @@ +cpu: 967986 +mem: 5402 +size: 69 + (constr 0 (con integer 0)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.budget.golden deleted file mode 100644 index 10d7c3cfe52..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 272100 -mem: 1800 -size: 49 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.eval.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.eval.golden index f217693e82c..3904abb9ea1 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.eval.golden @@ -1 +1,5 @@ +cpu: 272100 +mem: 1800 +size: 49 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.budget.golden deleted file mode 100644 index dddc524c7d0..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 8403040 -mem: 38840 -size: 69 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.eval.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.eval.golden index f217693e82c..3d4936c3f05 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.eval.golden @@ -1 +1,5 @@ +cpu: 8403040 +mem: 38840 +size: 69 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/gte0.budget.golden b/plutus-tx-plugin/test/Budget/9.6/gte0.budget.golden deleted file mode 100644 index edba461abc6..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/gte0.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1191128986 -mem: 5309702 -size: 72 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/gte0.eval.golden b/plutus-tx-plugin/test/Budget/9.6/gte0.eval.golden index 1dd2b8ed5d3..04fb54779a4 100644 --- a/plutus-tx-plugin/test/Budget/9.6/gte0.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/gte0.eval.golden @@ -1 +1,5 @@ +cpu: 1191128986 +mem: 5309702 +size: 72 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/ifThenElse1.budget.golden b/plutus-tx-plugin/test/Budget/9.6/ifThenElse1.budget.golden deleted file mode 100644 index d71e6b97bd2..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/ifThenElse1.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 16100 -mem: 200 -size: 1 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/ifThenElse1.eval.golden b/plutus-tx-plugin/test/Budget/9.6/ifThenElse1.eval.golden index 4c1ba608f00..e089439dce3 100644 --- a/plutus-tx-plugin/test/Budget/9.6/ifThenElse1.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/ifThenElse1.eval.golden @@ -1 +1,5 @@ +cpu: 16100 +mem: 200 +size: 1 + (con integer 5) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/ifThenElse2.budget.golden b/plutus-tx-plugin/test/Budget/9.6/ifThenElse2.budget.golden deleted file mode 100644 index d71e6b97bd2..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/ifThenElse2.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 16100 -mem: 200 -size: 1 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/ifThenElse2.eval.golden b/plutus-tx-plugin/test/Budget/9.6/ifThenElse2.eval.golden index 18f82fcea50..87643d89ebc 100644 --- a/plutus-tx-plugin/test/Budget/9.6/ifThenElse2.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/ifThenElse2.eval.golden @@ -1 +1,5 @@ +cpu: 16100 +mem: 200 +size: 1 + (con integer 18) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/listIndexing.budget.golden b/plutus-tx-plugin/test/Budget/9.6/listIndexing.budget.golden deleted file mode 100644 index 056cf0ef8aa..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/listIndexing.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5004432 -mem: 23422 -size: 82 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/listIndexing.eval.golden b/plutus-tx-plugin/test/Budget/9.6/listIndexing.eval.golden index f5d13a24393..343fa3b14f3 100644 --- a/plutus-tx-plugin/test/Budget/9.6/listIndexing.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/listIndexing.eval.golden @@ -1 +1,5 @@ +cpu: 5004432 +mem: 23422 +size: 82 + (con data (I 6)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/lte0.budget.golden b/plutus-tx-plugin/test/Budget/9.6/lte0.budget.golden deleted file mode 100644 index c0a429eed44..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/lte0.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1189675986 -mem: 5309702 -size: 72 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/lte0.eval.golden b/plutus-tx-plugin/test/Budget/9.6/lte0.eval.golden index 1dd2b8ed5d3..428c01607df 100644 --- a/plutus-tx-plugin/test/Budget/9.6/lte0.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/lte0.eval.golden @@ -1 +1,5 @@ +cpu: 1189675986 +mem: 5309702 +size: 72 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map1.budget.golden b/plutus-tx-plugin/test/Budget/9.6/map1.budget.golden deleted file mode 100644 index b7d20952bb0..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/map1.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 255988667 -mem: 642158 -size: 384 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map1.eval.golden b/plutus-tx-plugin/test/Budget/9.6/map1.eval.golden index 9732f5cd234..7c032567211 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map1.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map1.eval.golden @@ -1,3 +1,7 @@ +cpu: 255988667 +mem: 642158 +size: 384 + (constr 0 (constr 0 (con integer 0)) diff --git a/plutus-tx-plugin/test/Budget/9.6/map2.budget.golden b/plutus-tx-plugin/test/Budget/9.6/map2.budget.golden deleted file mode 100644 index aab122930d3..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/map2.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 121640515 -mem: 365182 -size: 466 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map2.eval.golden b/plutus-tx-plugin/test/Budget/9.6/map2.eval.golden index 5bd4d9be18b..c101a24dab3 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map2.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map2.eval.golden @@ -1,3 +1,7 @@ +cpu: 121640515 +mem: 365182 +size: 466 + (constr 1 (constr 0 (con integer 105) (con integer 5)) diff --git a/plutus-tx-plugin/test/Budget/9.6/map3.budget.golden b/plutus-tx-plugin/test/Budget/9.6/map3.budget.golden deleted file mode 100644 index f144305ccb6..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/map3.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 194866927 -mem: 589080 -size: 772 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map3.eval.golden b/plutus-tx-plugin/test/Budget/9.6/map3.eval.golden index 16b2d5f9d58..5e425f3d09a 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map3.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map3.eval.golden @@ -1,3 +1,7 @@ +cpu: 194866927 +mem: 589080 +size: 772 + (constr 1 (constr 0 (con integer 103) (con integer 33)) diff --git a/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.budget.golden b/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.budget.golden deleted file mode 100644 index 6de25999192..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1196851 -mem: 4362 -size: 80 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.eval.golden b/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.eval.golden index 132831f390c..4bd3244fd6c 100644 --- a/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/matchAsDataE.eval.golden @@ -1 +1,5 @@ +cpu: 1196851 +mem: 4362 +size: 80 + (con integer 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/monadicDo.budget.golden b/plutus-tx-plugin/test/Budget/9.6/monadicDo.budget.golden deleted file mode 100644 index 1829729d6af..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/monadicDo.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 197308 -mem: 702 -size: 6 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/monadicDo.eval.golden b/plutus-tx-plugin/test/Budget/9.6/monadicDo.eval.golden index 13675c87619..baf41c73511 100644 --- a/plutus-tx-plugin/test/Budget/9.6/monadicDo.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/monadicDo.eval.golden @@ -1 +1,5 @@ +cpu: 197308 +mem: 702 +size: 6 + (constr 0 (con integer 3)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/not-not.budget.golden b/plutus-tx-plugin/test/Budget/9.6/not-not.budget.golden deleted file mode 100644 index 71264658ec8..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/not-not.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 361439 -mem: 1602 -size: 15 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/not-not.eval.golden b/plutus-tx-plugin/test/Budget/9.6/not-not.eval.golden index 1dd2b8ed5d3..c0aad81b69f 100644 --- a/plutus-tx-plugin/test/Budget/9.6/not-not.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/not-not.eval.golden @@ -1 +1,5 @@ +cpu: 361439 +mem: 1602 +size: 15 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/notElemCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/notElemCheap.budget.golden deleted file mode 100644 index 3e91e0d581b..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/notElemCheap.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 912482 -mem: 5002 -size: 56 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/notElemCheap.eval.golden b/plutus-tx-plugin/test/Budget/9.6/notElemCheap.eval.golden index f217693e82c..84873ef0f52 100644 --- a/plutus-tx-plugin/test/Budget/9.6/notElemCheap.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/notElemCheap.eval.golden @@ -1 +1,5 @@ +cpu: 912482 +mem: 5002 +size: 56 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.budget.golden deleted file mode 100644 index 06ad5d125e6..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5827920 -mem: 28520 -size: 56 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.eval.golden b/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.eval.golden index 1dd2b8ed5d3..a8c478af6f0 100644 --- a/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.eval.golden @@ -1 +1,5 @@ +cpu: 5827920 +mem: 28520 +size: 56 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/null.budget.golden b/plutus-tx-plugin/test/Budget/9.6/null.budget.golden deleted file mode 100644 index d71e6b97bd2..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/null.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 16100 -mem: 200 -size: 1 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/null.eval.golden b/plutus-tx-plugin/test/Budget/9.6/null.eval.golden index f217693e82c..5310712c9f6 100644 --- a/plutus-tx-plugin/test/Budget/9.6/null.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/null.eval.golden @@ -1 +1,5 @@ +cpu: 16100 +mem: 200 +size: 1 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/orCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/orCheap.budget.golden deleted file mode 100644 index c899c557111..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/orCheap.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 640100 -mem: 4100 -size: 48 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/orCheap.eval.golden b/plutus-tx-plugin/test/Budget/9.6/orCheap.eval.golden index 1dd2b8ed5d3..cdeba2ace6d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/orCheap.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/orCheap.eval.golden @@ -1 +1,5 @@ +cpu: 640100 +mem: 4100 +size: 48 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/orExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/orExpensive.budget.golden deleted file mode 100644 index 6bd49e54064..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/orExpensive.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 3104100 -mem: 19500 -size: 48 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/orExpensive.eval.golden b/plutus-tx-plugin/test/Budget/9.6/orExpensive.eval.golden index f217693e82c..da2f11f51d5 100644 --- a/plutus-tx-plugin/test/Budget/9.6/orExpensive.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/orExpensive.eval.golden @@ -1 +1,5 @@ +cpu: 3104100 +mem: 19500 +size: 48 + (constr 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/patternMatch.budget.golden b/plutus-tx-plugin/test/Budget/9.6/patternMatch.budget.golden deleted file mode 100644 index 3c2b6af8964..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/patternMatch.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 32100 -mem: 300 -size: 2 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/patternMatch.eval.golden b/plutus-tx-plugin/test/Budget/9.6/patternMatch.eval.golden index 13675c87619..b7df374da09 100644 --- a/plutus-tx-plugin/test/Budget/9.6/patternMatch.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/patternMatch.eval.golden @@ -1 +1,5 @@ +cpu: 32100 +mem: 300 +size: 2 + (constr 0 (con integer 3)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.budget.golden b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.budget.golden deleted file mode 100644 index d33433b1abb..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1399400986 -mem: 6611402 -size: 104 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.eval.golden b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.eval.golden index 1dd2b8ed5d3..6c659947fbf 100644 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.eval.golden @@ -1 +1,5 @@ +cpu: 1399400986 +mem: 6611402 +size: 104 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.budget.golden b/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.budget.golden deleted file mode 100644 index ee44b8f65a3..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1397947986 -mem: 6611402 -size: 104 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.eval.golden b/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.eval.golden index 1dd2b8ed5d3..8e0b511090e 100644 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.eval.golden @@ -1 +1,5 @@ +cpu: 1397947986 +mem: 6611402 +size: 104 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/show.budget.golden b/plutus-tx-plugin/test/Budget/9.6/show.budget.golden deleted file mode 100644 index 9ba1dccb6b5..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/show.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1358901555 -mem: 5829124 -size: 859 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/show.eval.golden b/plutus-tx-plugin/test/Budget/9.6/show.eval.golden index 8dff6713877..d2e9d0b0ff0 100644 --- a/plutus-tx-plugin/test/Budget/9.6/show.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/show.eval.golden @@ -1 +1,5 @@ +cpu: 1358901555 +mem: 5829124 +size: 859 + (con integer -2469135780) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sum.budget.golden b/plutus-tx-plugin/test/Budget/9.6/sum.budget.golden deleted file mode 100644 index 2482b286f6e..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/sum.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 5476180 -mem: 28020 -size: 77 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sum.eval.golden b/plutus-tx-plugin/test/Budget/9.6/sum.eval.golden index 0dc9ac9d664..3f57e8c35a0 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sum.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/sum.eval.golden @@ -1 +1,5 @@ +cpu: 5476180 +mem: 28020 +size: 77 + (con integer 55) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.budget.golden b/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.budget.golden deleted file mode 100644 index 0f7ed20ba54..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1892446 -mem: 6388 -size: 59 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.eval.golden b/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.eval.golden index b58276100aa..064c5138bda 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/sumAtIndices.eval.golden @@ -1 +1,5 @@ +cpu: 1892446 +mem: 6388 +size: 59 + (con integer 100) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumL.budget.golden b/plutus-tx-plugin/test/Budget/9.6/sumL.budget.golden deleted file mode 100644 index 585700bb4eb..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/sumL.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1171189986 -mem: 5310902 -size: 81 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumL.eval.golden b/plutus-tx-plugin/test/Budget/9.6/sumL.eval.golden index fe21181254b..315068487bb 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumL.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/sumL.eval.golden @@ -1 +1,5 @@ +cpu: 1171189986 +mem: 5310902 +size: 81 + (con integer 500500) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumR.budget.golden b/plutus-tx-plugin/test/Budget/9.6/sumR.budget.golden deleted file mode 100644 index aa0550a9e43..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/sumR.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1075045986 -mem: 4710002 -size: 67 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumR.eval.golden b/plutus-tx-plugin/test/Budget/9.6/sumR.eval.golden index fe21181254b..5202f92a5cb 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumR.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/sumR.eval.golden @@ -1 +1,5 @@ +cpu: 1075045986 +mem: 4710002 +size: 67 + (con integer 500500) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/toFromData.budget.golden b/plutus-tx-plugin/test/Budget/9.6/toFromData.budget.golden deleted file mode 100644 index 3d30843f0ba..00000000000 --- a/plutus-tx-plugin/test/Budget/9.6/toFromData.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 7980913 -mem: 28440 -size: 320 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/toFromData.eval.golden b/plutus-tx-plugin/test/Budget/9.6/toFromData.eval.golden index 96edd569023..5d2a1645cc1 100644 --- a/plutus-tx-plugin/test/Budget/9.6/toFromData.eval.golden +++ b/plutus-tx-plugin/test/Budget/9.6/toFromData.eval.golden @@ -1 +1,5 @@ +cpu: 7980913 +mem: 28440 +size: 320 + (constr 1 (constr 0 (constr 0 (constr 0) (con integer 1) (constr 1)))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.budget.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.budget.golden deleted file mode 100644 index 164df2a7643..00000000000 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 14535700 -mem: 62410 -size: 86 \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.eval.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.eval.golden index 703e25ffe32..763e1bc8b5b 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.eval.golden +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/all.eval.golden @@ -1 +1,5 @@ +cpu: 14535700 +mem: 62410 +size: 86 + (constr 0 (constr 1) (constr 0)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.budget.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.budget.golden deleted file mode 100644 index ca98d645cd2..00000000000 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 23293722 -mem: 99496 -size: 86 \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.eval.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.eval.golden index 78d8e34f617..216aca2b2f7 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.eval.golden +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/any.eval.golden @@ -1 +1,5 @@ +cpu: 23293722 +mem: 99496 +size: 86 + (constr 0 (constr 0) (constr 1)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/elem.budget.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/elem.budget.golden deleted file mode 100644 index 8ae38c2b6bd..00000000000 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/elem.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 22604496 -mem: 94396 -size: 93 \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/elem.eval.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/elem.eval.golden index 78d8e34f617..48dee373482 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/elem.eval.golden +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/elem.eval.golden @@ -1 +1,5 @@ +cpu: 22604496 +mem: 94396 +size: 93 + (constr 0 (constr 0) (constr 1)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.budget.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.budget.golden deleted file mode 100644 index 852c15664c3..00000000000 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 23309722 -mem: 99596 -size: 87 \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.eval.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.eval.golden index 231417b8240..094647521fa 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.eval.golden +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/find.eval.golden @@ -1 +1,5 @@ +cpu: 23309722 +mem: 99596 +size: 87 + (constr 0 (constr 0 (con integer 8)) (constr 1)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.budget.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.budget.golden deleted file mode 100644 index 5ee0fc52d26..00000000000 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 8343274 -mem: 33698 -size: 81 \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.eval.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.eval.golden index 96d17867bdd..f6a19567956 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.eval.golden +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/index.eval.golden @@ -1 +1,5 @@ +cpu: 8343274 +mem: 33698 +size: 81 + (con integer 6) \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.budget.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.budget.golden deleted file mode 100644 index 96f341aea8c..00000000000 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 10606864 -mem: 37432 -size: 43 \ No newline at end of file diff --git a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.eval.golden b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.eval.golden index 38d74447397..1e72d768921 100644 --- a/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.eval.golden +++ b/plutus-tx-plugin/test/BuiltinList/Budget/9.6/map.eval.golden @@ -1 +1,5 @@ +cpu: 10606864 +mem: 37432 +size: 43 + (con (list integer) [2,3,4,5,6,7,8,9,10,11]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/any.budget.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/any.budget.golden deleted file mode 100644 index dffb47f5244..00000000000 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/any.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 9183220 -mem: 36540 -size: 59 \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/any.eval.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/any.eval.golden index 1dd2b8ed5d3..140d1db8fc5 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/any.eval.golden +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/any.eval.golden @@ -1 +1,5 @@ +cpu: 9183220 +mem: 36540 +size: 59 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/elem.budget.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/elem.budget.golden deleted file mode 100644 index 6b96bcaca12..00000000000 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/elem.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 16675292 -mem: 34684 -size: 57 \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/elem.eval.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/elem.eval.golden index 1dd2b8ed5d3..51cb87d37f9 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/elem.eval.golden +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/elem.eval.golden @@ -1 +1,5 @@ +cpu: 16675292 +mem: 34684 +size: 57 + (constr 0) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/filter.budget.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/filter.budget.golden deleted file mode 100644 index 3987dbb846e..00000000000 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/filter.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 12570977 -mem: 50224 -size: 73 \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/filter.eval.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/filter.eval.golden index 93b5ee6c6d5..90485f8082c 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/filter.eval.golden +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/filter.eval.golden @@ -1 +1,5 @@ +cpu: 12570977 +mem: 50224 +size: 73 + (con (list data) [I 8, I 9, I 10]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/length.budget.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/length.budget.golden deleted file mode 100644 index e4bd625c510..00000000000 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/length.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 9659244 -mem: 35712 -size: 47 \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/length.eval.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/length.eval.golden index 3df7275df82..0ff2611645b 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/length.eval.golden +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/length.eval.golden @@ -1 +1,5 @@ +cpu: 9659244 +mem: 35712 +size: 47 + (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.budget.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.budget.golden deleted file mode 100644 index 60bb9e13332..00000000000 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 1671083 -mem: 9092 -size: 68 \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.eval.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.eval.golden index b2aa622b502..0b1a26c3bbb 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.eval.golden +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/makeList.eval.golden @@ -1 +1,5 @@ +cpu: 1671083 +mem: 9092 +size: 68 + (con (list data) [I 1, I 2, I 3]) \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/partition.budget.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/partition.budget.golden deleted file mode 100644 index 40d4e3a8537..00000000000 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/partition.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 14295614 -mem: 58252 -size: 76 \ No newline at end of file diff --git a/plutus-tx-plugin/test/DataList/Budget/9.6/partition.eval.golden b/plutus-tx-plugin/test/DataList/Budget/9.6/partition.eval.golden index 108bf0fbbd5..7b7cb7344ad 100644 --- a/plutus-tx-plugin/test/DataList/Budget/9.6/partition.eval.golden +++ b/plutus-tx-plugin/test/DataList/Budget/9.6/partition.eval.golden @@ -1,3 +1,7 @@ +cpu: 14295614 +mem: 58252 +size: 76 + (constr 0 (con (list data) [I 8, I 9, I 10]) diff --git a/plutus-tx-plugin/test/Lib.hs b/plutus-tx-plugin/test/Lib.hs deleted file mode 100644 index 1d75a184cd4..00000000000 --- a/plutus-tx-plugin/test/Lib.hs +++ /dev/null @@ -1,82 +0,0 @@ --- editorconfig-checker-disable-file -{-# LANGUAGE DerivingStrategies #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE UndecidableInstances #-} -{-# OPTIONS_GHC -Wno-orphans #-} - -module Lib where - -import Control.Exception -import Control.Lens -import Control.Monad.Except -import Data.Either.Extras -import Data.Text (Text) -import Flat (Flat) -import Test.Tasty.Extras - -import PlutusPrelude - -import PlutusCore.Test - -import PlutusTx.Code -import PlutusTx.Test () - -import PlutusCore qualified as PLC -import PlutusCore.Evaluation.Machine.ExBudgetingDefaults qualified as PLC -import PlutusCore.Pretty - -import UntypedPlutusCore qualified as UPLC -import UntypedPlutusCore.Evaluation.Machine.Cek - -goldenPir - :: (PrettyUni uni, Pretty fun, uni `PLC.Everywhere` Flat, Flat fun) - => String - -> CompiledCodeIn uni fun a - -> TestNested -goldenPir name value = - nestedGoldenVsDoc name ".pir" $ - prettyPlcClassicSimple $ - getPirNoAnn value - -runPlcCek - :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) - => [a] - -> ExceptT SomeException IO (UPLC.Term PLC.Name PLC.DefaultUni PLC.DefaultFun ()) -runPlcCek values = do - ps <- traverse toUPlc values - let p = foldl1 (unsafeFromRight .* UPLC.applyProgram) ps - fromRightM (throwError . SomeException) $ - evaluateCekNoEmit PLC.defaultCekParametersForTesting (p ^. UPLC.progTerm) - -runPlcCekTrace - :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) - => [a] - -> ExceptT - SomeException - IO - ( [Text] - , CekExTally PLC.DefaultFun - , UPLC.Term PLC.Name PLC.DefaultUni PLC.DefaultFun () - ) -runPlcCekTrace values = do - ps <- traverse toUPlc values - let p = - foldl1 (unsafeFromRight .* UPLC.applyProgram) ps - let (result, TallyingSt tally _, logOut) = - runCek PLC.defaultCekParametersForTesting tallying logEmitter (p ^. UPLC.progTerm) - res <- fromRightM (throwError . SomeException) result - pure (logOut, tally, res) - -goldenEvalCek :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) => String -> [a] -> TestNested -goldenEvalCek name values = - nestedGoldenVsDocM name ".eval-cek" $ - prettyPlcClassicSimple <$> (rethrow $ runPlcCek values) - -goldenEvalCekLog :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) => String -> [a] -> TestNested -goldenEvalCekLog name values = - nestedGoldenVsDocM name ".eval-cek-log" $ - prettyPlcClassicSimple . view _1 <$> (rethrow $ runPlcCekTrace values) diff --git a/plutus-tx-plugin/test/Plugin/Strict/Spec.hs b/plutus-tx-plugin/test/Plugin/Strict/Spec.hs index f948ef9d333..93dd3b60248 100644 --- a/plutus-tx-plugin/test/Plugin/Strict/Spec.hs +++ b/plutus-tx-plugin/test/Plugin/Strict/Spec.hs @@ -38,7 +38,7 @@ strict = testNested "Strict" . pure $ testNestedGhc -- in this instance (see -- https://github.com/IntersectMBO/plutus/pull/5371#discussion_r1285087508), -- however we have now fixed the bug on our side so it's just GHC being annoying. - , goldenEvalCekLog "issue4645" [ issue4645 ] + , goldenEvalCekLog "issue4645" issue4645 ] strictAdd :: CompiledCode (Integer -> Integer -> Integer) diff --git a/plutus-tx-plugin/test/Recursion/9.6/length-direct.budget.golden b/plutus-tx-plugin/test/Recursion/9.6/length-direct.budget.golden deleted file mode 100644 index 0ebdc88af96..00000000000 --- a/plutus-tx-plugin/test/Recursion/9.6/length-direct.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 3764180 -mem: 17320 -size: 43 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Recursion/9.6/length-direct.eval.golden b/plutus-tx-plugin/test/Recursion/9.6/length-direct.eval.golden index 3df7275df82..2249bc5dfe4 100644 --- a/plutus-tx-plugin/test/Recursion/9.6/length-direct.eval.golden +++ b/plutus-tx-plugin/test/Recursion/9.6/length-direct.eval.golden @@ -1 +1,5 @@ +cpu: 3764180 +mem: 17320 +size: 43 + (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Recursion/9.6/length-fix.budget.golden b/plutus-tx-plugin/test/Recursion/9.6/length-fix.budget.golden deleted file mode 100644 index 0ebdc88af96..00000000000 --- a/plutus-tx-plugin/test/Recursion/9.6/length-fix.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 3764180 -mem: 17320 -size: 43 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Recursion/9.6/length-fix.eval.golden b/plutus-tx-plugin/test/Recursion/9.6/length-fix.eval.golden index 3df7275df82..2249bc5dfe4 100644 --- a/plutus-tx-plugin/test/Recursion/9.6/length-fix.eval.golden +++ b/plutus-tx-plugin/test/Recursion/9.6/length-fix.eval.golden @@ -1 +1,5 @@ +cpu: 3764180 +mem: 17320 +size: 43 + (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Recursion/9.6/length-peeled.budget.golden b/plutus-tx-plugin/test/Recursion/9.6/length-peeled.budget.golden deleted file mode 100644 index 6a0a922a885..00000000000 --- a/plutus-tx-plugin/test/Recursion/9.6/length-peeled.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 3524180 -mem: 15820 -size: 73 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Recursion/9.6/length-peeled.eval.golden b/plutus-tx-plugin/test/Recursion/9.6/length-peeled.eval.golden index 3df7275df82..0aa649acd23 100644 --- a/plutus-tx-plugin/test/Recursion/9.6/length-peeled.eval.golden +++ b/plutus-tx-plugin/test/Recursion/9.6/length-peeled.eval.golden @@ -1 +1,5 @@ +cpu: 3524180 +mem: 15820 +size: 73 + (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Recursion/9.6/length-unrolled.budget.golden b/plutus-tx-plugin/test/Recursion/9.6/length-unrolled.budget.golden deleted file mode 100644 index 75b18aa9df8..00000000000 --- a/plutus-tx-plugin/test/Recursion/9.6/length-unrolled.budget.golden +++ /dev/null @@ -1,3 +0,0 @@ -cpu: 3092180 -mem: 13120 -size: 61 \ No newline at end of file diff --git a/plutus-tx-plugin/test/Recursion/9.6/length-unrolled.eval.golden b/plutus-tx-plugin/test/Recursion/9.6/length-unrolled.eval.golden index 3df7275df82..1259b7cc5b2 100644 --- a/plutus-tx-plugin/test/Recursion/9.6/length-unrolled.eval.golden +++ b/plutus-tx-plugin/test/Recursion/9.6/length-unrolled.eval.golden @@ -1 +1,5 @@ +cpu: 3092180 +mem: 13120 +size: 61 + (con integer 10) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Recursion/Spec.hs b/plutus-tx-plugin/test/Recursion/Spec.hs index c2bb0ff2452..d6373b13ab1 100644 --- a/plutus-tx-plugin/test/Recursion/Spec.hs +++ b/plutus-tx-plugin/test/Recursion/Spec.hs @@ -33,20 +33,14 @@ tests = goldenUPlcReadable "length-direct" compiledLengthDirect - , goldenEvalCekCatch - "length-direct" - [compiledLengthDirect `unsafeApplyCode` liftCodeDef [1 .. 10]] - , goldenBudget + , goldenEvalCekCatchBudget "length-direct" (compiledLengthDirect `unsafeApplyCode` liftCodeDef [1 .. 10]) , -- length function implemented using fix goldenUPlcReadable "length-fix" compiledLengthFix - , goldenEvalCekCatch - "length-fix" - [compiledLengthFix `unsafeApplyCode` liftCodeDef [1 .. 10]] - , goldenBudget + , goldenEvalCekCatchBudget "length-fix" (compiledLengthFix `unsafeApplyCode` liftCodeDef [1 .. 10]) , -- length function implemented using fix @@ -54,10 +48,7 @@ tests = goldenUPlcReadable "length-peeled" compiledLengthPeeled - , goldenEvalCekCatch - "length-peeled" - [compiledLengthPeeled `unsafeApplyCode` liftCodeDef [1 .. 10]] - , goldenBudget + , goldenEvalCekCatchBudget "length-peeled" (compiledLengthPeeled `unsafeApplyCode` liftCodeDef [1 .. 10]) , -- length function implemented using fix @@ -65,10 +56,7 @@ tests = goldenUPlcReadable "length-unrolled" compiledLengthUnrolled - , goldenEvalCekCatch - "length-unrolled" - [compiledLengthUnrolled `unsafeApplyCode` liftCodeDef [1 .. 10]] - , goldenBudget + , goldenEvalCekCatchBudget "length-unrolled" (compiledLengthUnrolled `unsafeApplyCode` liftCodeDef [1 .. 10]) ] diff --git a/plutus-tx-plugin/test/Strictness/9.6/let-default.eval.golden b/plutus-tx-plugin/test/Strictness/9.6/let-default.eval.golden index 132831f390c..fb20dd8e3e5 100644 --- a/plutus-tx-plugin/test/Strictness/9.6/let-default.eval.golden +++ b/plutus-tx-plugin/test/Strictness/9.6/let-default.eval.golden @@ -1 +1,5 @@ +cpu: 393439 +mem: 1802 +size: 27 + (con integer 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Strictness/9.6/let-nonstrict.eval.golden b/plutus-tx-plugin/test/Strictness/9.6/let-nonstrict.eval.golden index 132831f390c..fb20dd8e3e5 100644 --- a/plutus-tx-plugin/test/Strictness/9.6/let-nonstrict.eval.golden +++ b/plutus-tx-plugin/test/Strictness/9.6/let-nonstrict.eval.golden @@ -1 +1,5 @@ +cpu: 393439 +mem: 1802 +size: 27 + (con integer 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Strictness/9.6/let-strict.eval.golden b/plutus-tx-plugin/test/Strictness/9.6/let-strict.eval.golden index 132831f390c..fb20dd8e3e5 100644 --- a/plutus-tx-plugin/test/Strictness/9.6/let-strict.eval.golden +++ b/plutus-tx-plugin/test/Strictness/9.6/let-strict.eval.golden @@ -1 +1,5 @@ +cpu: 393439 +mem: 1802 +size: 27 + (con integer 1) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Strictness/Spec.hs b/plutus-tx-plugin/test/Strictness/Spec.hs index 6191122eaa0..bcc1e0439cb 100644 --- a/plutus-tx-plugin/test/Strictness/Spec.hs +++ b/plutus-tx-plugin/test/Strictness/Spec.hs @@ -16,30 +16,30 @@ import PlutusTx.TH (compile) tests :: TestNested tests = testNested "Strictness" . pure $ testNestedGhc - [ goldenEvalCekCatch "lambda-default" [lambdaDefault `unsafeApplyCode` bot] + [ goldenEvalCekCatchBudget "lambda-default" $ lambdaDefault `unsafeApplyCode` bot , goldenPirReadable "lambda-default" lambdaDefault , goldenUPlcReadable "lambda-default" lambdaDefault -- FIXME: This should not crash, but it currently does. - , goldenEvalCekCatch "lambda-nonstrict" [lambdaNonStrict `unsafeApplyCode` bot] + , goldenEvalCekCatchBudget "lambda-nonstrict" $ lambdaNonStrict `unsafeApplyCode` bot , goldenPirReadable "lambda-nonstrict" lambdaNonStrict , goldenUPlcReadable "lambda-nonstrict" lambdaNonStrict - , goldenEvalCekCatch "lambda-strict" [lambdaStrict `unsafeApplyCode` bot] + , goldenEvalCekCatchBudget "lambda-strict" $ lambdaStrict `unsafeApplyCode` bot , goldenPirReadable "lambda-strict" lambdaStrict , goldenUPlcReadable "lambda-strict" lambdaStrict -- FIXME: This should crash (because the `Strict` extension is on), but it currently doesn't. - , goldenEvalCekCatch "let-default" [letDefault `unsafeApplyCode` one] + , goldenEvalCekCatchBudget "let-default" $ letDefault `unsafeApplyCode` one , goldenPirReadable "let-default" letDefault , goldenUPlcReadable "let-default" letDefault - , goldenEvalCekCatch "let-nonstrict" [letNonStrict `unsafeApplyCode` one] + , goldenEvalCekCatchBudget "let-nonstrict" $ letNonStrict `unsafeApplyCode` one , goldenPirReadable "let-nonstrict" letNonStrict , goldenUPlcReadable "let-nonstrict" letNonStrict -- FIXME: This should crash, but it currently doesn't. - , goldenEvalCekCatch "let-strict" [letStrict `unsafeApplyCode` one] + , goldenEvalCekCatchBudget "let-strict" $ letStrict `unsafeApplyCode` one , goldenPirReadable "let-strict" letStrict , goldenUPlcReadable "let-strict" letStrict ] diff --git a/plutus-tx-plugin/test/TH/9.6/all.eval-cek.golden b/plutus-tx-plugin/test/TH/9.6/all.eval.golden similarity index 100% rename from plutus-tx-plugin/test/TH/9.6/all.eval-cek.golden rename to plutus-tx-plugin/test/TH/9.6/all.eval.golden diff --git a/plutus-tx-plugin/test/TH/9.6/and.pir.golden b/plutus-tx-plugin/test/TH/9.6/and.pir.golden index 3717babe38a..e1c5c1ebc4c 100644 --- a/plutus-tx-plugin/test/TH/9.6/and.pir.golden +++ b/plutus-tx-plugin/test/TH/9.6/and.pir.golden @@ -1,15 +1,12 @@ -(program - 1.1.0 - (let - (nonrec) - (datatypebind - (datatype - (tyvardecl Bool (type)) +(let + (nonrec) + (datatypebind + (datatype + (tyvardecl Bool (type)) - Bool_match - (vardecl True Bool) (vardecl False Bool) - ) + Bool_match + (vardecl True Bool) (vardecl False Bool) ) - False ) + False ) \ No newline at end of file diff --git a/plutus-tx-plugin/test/TH/9.6/convertString.eval-cek.golden b/plutus-tx-plugin/test/TH/9.6/convertString.eval.golden similarity index 100% rename from plutus-tx-plugin/test/TH/9.6/convertString.eval-cek.golden rename to plutus-tx-plugin/test/TH/9.6/convertString.eval.golden diff --git a/plutus-tx-plugin/test/TH/9.6/power.pir.golden b/plutus-tx-plugin/test/TH/9.6/power.pir.golden index 713c226371a..e6f5abffca5 100644 --- a/plutus-tx-plugin/test/TH/9.6/power.pir.golden +++ b/plutus-tx-plugin/test/TH/9.6/power.pir.golden @@ -1,58 +1,55 @@ -(program - 1.1.0 - (let - (nonrec) - (termbind - (strict) - (vardecl - multiplyInteger (fun (con integer) (fun (con integer) (con integer))) - ) - (builtin multiplyInteger) +(let + (nonrec) + (termbind + (strict) + (vardecl + multiplyInteger (fun (con integer) (fun (con integer) (con integer))) ) - (termbind - (nonstrict) - (vardecl - multiplyInteger (fun (con integer) (fun (con integer) (con integer))) - ) - (lam - x - (con integer) - (let - (nonrec) - (termbind (strict) (vardecl x (con integer)) x) - (lam - y - (con integer) - (let - (nonrec) - (termbind (strict) (vardecl y (con integer)) y) - [ [ multiplyInteger x ] y ] - ) - ) - ) - ) + (builtin multiplyInteger) + ) + (termbind + (nonstrict) + (vardecl + multiplyInteger (fun (con integer) (fun (con integer) (con integer))) ) (lam - ds + x (con integer) (let (nonrec) - (termbind (strict) (vardecl ds (con integer)) ds) - (termbind - (strict) - (vardecl y (con integer)) + (termbind (strict) (vardecl x (con integer)) x) + (lam + y + (con integer) (let (nonrec) - (termbind - (strict) - (vardecl y (con integer)) - [ [ multiplyInteger ds ] (con integer 1) ] - ) - [ [ multiplyInteger y ] y ] + (termbind (strict) (vardecl y (con integer)) y) + [ [ multiplyInteger x ] y ] + ) + ) + ) + ) + ) + (lam + ds + (con integer) + (let + (nonrec) + (termbind (strict) (vardecl ds (con integer)) ds) + (termbind + (strict) + (vardecl y (con integer)) + (let + (nonrec) + (termbind + (strict) + (vardecl y (con integer)) + [ [ multiplyInteger ds ] (con integer 1) ] ) + [ [ multiplyInteger y ] y ] ) - [ [ multiplyInteger y ] y ] ) + [ [ multiplyInteger y ] y ] ) ) ) \ No newline at end of file diff --git a/plutus-tx-plugin/test/TH/9.6/simple.pir.golden b/plutus-tx-plugin/test/TH/9.6/simple.pir.golden index 4731f8026e2..2d12600e640 100644 --- a/plutus-tx-plugin/test/TH/9.6/simple.pir.golden +++ b/plutus-tx-plugin/test/TH/9.6/simple.pir.golden @@ -1,26 +1,22 @@ -(program - 1.1.0 - (let - (nonrec) - (datatypebind - (datatype - (tyvardecl Bool (type)) +(let + (nonrec) + (datatypebind + (datatype + (tyvardecl Bool (type)) - Bool_match - (vardecl True Bool) (vardecl False Bool) - ) + Bool_match + (vardecl True Bool) (vardecl False Bool) ) - (lam - ds - Bool - (let - (nonrec) - (termbind (strict) (vardecl ds Bool) ds) - [ - [ { [ Bool_match ds ] (con integer) } (con integer 1) ] - (con integer 2) - ] - ) + ) + (lam + ds + Bool + (let + (nonrec) + (termbind (strict) (vardecl ds Bool) ds) + [ + [ { [ Bool_match ds ] (con integer) } (con integer 1) ] (con integer 2) + ] ) ) ) \ No newline at end of file diff --git a/plutus-tx-plugin/test/TH/9.6/traceDirect.eval-cek-log.golden b/plutus-tx-plugin/test/TH/9.6/traceDirect.eval.golden similarity index 100% rename from plutus-tx-plugin/test/TH/9.6/traceDirect.eval-cek-log.golden rename to plutus-tx-plugin/test/TH/9.6/traceDirect.eval.golden diff --git a/plutus-tx-plugin/test/TH/9.6/tracePrelude.eval-cek-log.golden b/plutus-tx-plugin/test/TH/9.6/tracePrelude.eval.golden similarity index 100% rename from plutus-tx-plugin/test/TH/9.6/tracePrelude.eval-cek-log.golden rename to plutus-tx-plugin/test/TH/9.6/tracePrelude.eval.golden diff --git a/plutus-tx-plugin/test/TH/9.6/traceRepeatedly.eval-cek-log.golden b/plutus-tx-plugin/test/TH/9.6/traceRepeatedly.eval.golden similarity index 100% rename from plutus-tx-plugin/test/TH/9.6/traceRepeatedly.eval-cek-log.golden rename to plutus-tx-plugin/test/TH/9.6/traceRepeatedly.eval.golden diff --git a/plutus-tx-plugin/test/TH/Spec.hs b/plutus-tx-plugin/test/TH/Spec.hs index 10bbbb0bedd..57eb395dc0b 100644 --- a/plutus-tx-plugin/test/TH/Spec.hs +++ b/plutus-tx-plugin/test/TH/Spec.hs @@ -15,8 +15,6 @@ module TH.Spec (tests) where import Test.Tasty.Extras -import Lib - import PlutusCore.Pretty import PlutusTx @@ -24,6 +22,7 @@ import PlutusTx.Builtins qualified as Builtins import PlutusTx.List qualified as List import PlutusTx.Prelude import PlutusTx.Show (show) +import PlutusTx.Test import Prelude qualified as Haskell @@ -41,11 +40,11 @@ tests = testNested "TH" . pure $ testNestedGhc [ goldenPir "simple" simple , goldenPir "power" powerPlc , goldenPir "and" andPlc - , goldenEvalCek "all" [allPlc] - , goldenEvalCek "convertString" [convertString] - , goldenEvalCekLog "traceDirect" [traceDirect] - , goldenEvalCekLog "tracePrelude" [tracePrelude] - , goldenEvalCekLog "traceRepeatedly" [traceRepeatedly] + , goldenEvalCek "all" allPlc + , goldenEvalCek "convertString" convertString + , goldenEvalCekLog "traceDirect" traceDirect + , goldenEvalCekLog "tracePrelude" tracePrelude + , goldenEvalCekLog "traceRepeatedly" traceRepeatedly -- want to see the raw structure, so using Show , nestedGoldenVsDoc "someData" "" (pretty $ Haskell.show someData) ] diff --git a/plutus-tx/testlib/PlutusTx/Test.hs b/plutus-tx/testlib/PlutusTx/Test.hs index 54ef7712bb3..26f4af130ef 100644 --- a/plutus-tx/testlib/PlutusTx/Test.hs +++ b/plutus-tx/testlib/PlutusTx/Test.hs @@ -3,6 +3,7 @@ {-# LANGUAGE KindSignatures #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TupleSections #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} @@ -24,11 +25,8 @@ module PlutusTx.Test ( -- * Evaluation testing goldenEvalCek, - goldenEvalCekCatch, goldenEvalCekLog, - - -- * Budget and size testing - goldenBudget, + goldenEvalCekCatchBudget, -- * Combined testing goldenBundle, @@ -39,7 +37,7 @@ import Prelude import Control.Exception (SomeException (..)) import Control.Lens (Field1 (_1)) -import Control.Monad.Except (ExceptT, MonadError (throwError), runExceptT) +import Control.Monad.Except (ExceptT, MonadError (throwError)) import Data.Either.Extras (fromRightM) import Data.Kind (Type) import Data.Tagged (Tagged (Tagged)) @@ -55,7 +53,7 @@ import PlutusCore.Pretty (PrettyConfigClassic, PrettyConfigName, PrettyConst, Pr import PlutusCore.Pretty qualified as PLC import PlutusCore.Test (TestNested, ToTPlc (..), ToUPlc (..), catchAll, goldenSize, goldenTPlc, goldenUPlc, goldenUPlcReadable, nestedGoldenVsDoc, nestedGoldenVsDocM, - ppCatch, rethrow, runUPlcBudget) + ppCatch, rethrow) import PlutusIR.Analysis.Builtins qualified as PIR import PlutusIR.Core.Type (progTerm) import PlutusIR.Test () @@ -117,20 +115,6 @@ renderExcess :: (TestName, Integer) -> (TestName, Integer) -> Integer -> String renderExcess tData mData diff = renderEstimates tData mData <> "Remaining headroom: " <> show diff -goldenBudget :: TestName -> CompiledCode a -> TestNested -goldenBudget name compiledCode = do - nestedGoldenVsDocM name ".budget" $ ppCatch $ do - PLC.ExBudget cpu mem <- runUPlcBudget [compiledCode] - size <- UPLC.programSize <$> toUPlc compiledCode - let contents = - "cpu: " - <> pretty cpu - <> "\nmem: " - <> pretty mem - <> "\nsize: " - <> pretty size - pure (render @Text contents) - goldenBundle :: TestName -> CompiledCodeIn UPLC.DefaultUni UPLC.DefaultFun a @@ -139,8 +123,7 @@ goldenBundle goldenBundle name x y = do goldenPirReadable name x goldenUPlcReadable name x - goldenEvalCekCatch name [y] - goldenBudget name y + goldenEvalCekCatchBudget name y goldenBundle' :: TestName @@ -201,21 +184,31 @@ goldenPirBy config name value = -- Evaluation testing -- TODO: rationalize with the functions exported from PlcTestUtils -goldenEvalCek :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) => TestName -> [a] -> TestNested -goldenEvalCek name values = +goldenEvalCek :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) => TestName -> a -> TestNested +goldenEvalCek name term = nestedGoldenVsDocM name ".eval" $ - prettyPlcClassicSimple <$> rethrow (runPlcCek values) + prettyPlcClassicSimple <$> rethrow (runPlcCek term) -goldenEvalCekCatch :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) => TestName -> [a] -> TestNested -goldenEvalCekCatch name values = +goldenEvalCekLog :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) => TestName -> a -> TestNested +goldenEvalCekLog name term = nestedGoldenVsDocM name ".eval" $ - either (pretty . show) prettyPlcClassicSimple - <$> runExceptT (runPlcCek values) + prettyPlcClassicSimple . view _1 <$> (rethrow $ runPlcCekTrace term) -goldenEvalCekLog :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) => TestName -> [a] -> TestNested -goldenEvalCekLog name values = - nestedGoldenVsDocM name ".eval" $ - prettyPlcClassicSimple . view _1 <$> (rethrow $ runPlcCekTrace values) +goldenEvalCekCatchBudget :: TestName -> CompiledCode a -> TestNested +goldenEvalCekCatchBudget name compiledCode = + nestedGoldenVsDocM name ".eval" $ ppCatch $ do + (termRes, PLC.ExBudget cpu mem) <- runPlcCekBudget compiledCode + size <- UPLC.programSize <$> toUPlc compiledCode + let contents = + "cpu: " + <> pretty cpu + <> "\nmem: " + <> pretty mem + <> "\nsize: " + <> pretty size + <> "\n\n" + <> prettyPlcClassicSimple termRes + pure (render @Text contents) -- Helpers @@ -250,22 +243,40 @@ instance runPlcCek :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) - => [a] + => a -> ExceptT SomeException IO (UPLC.Term PLC.Name PLC.DefaultUni PLC.DefaultFun ()) -runPlcCek values = do - ps <- traverse toUPlc values - let p = foldl1 (unsafeFromRight .* UPLC.applyProgram) ps +runPlcCek val = do + term <- toUPlc val fromRightM (throwError . SomeException) $ - UPLC.evaluateCekNoEmit - PLC.defaultCekParametersForTesting - (p ^. UPLC.progTerm) + UPLC.evaluateCekNoEmit + PLC.defaultCekParametersForTesting + (term ^. UPLC.progTerm) + +runPlcCekBudget + :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) + => a + -> ExceptT + SomeException + IO + (UPLC.Term PLC.Name PLC.DefaultUni PLC.DefaultFun (), PLC.ExBudget) +runPlcCekBudget val = do + term <- toUPlc val + fromRightM (throwError . SomeException) $ do + let + (evalRes, UPLC.CountingSt budget) = + UPLC.runCekNoEmit + PLC.defaultCekParametersForTesting + UPLC.counting + (term ^. UPLC.progTerm) + + (, budget) <$> evalRes runPlcCekTrace :: (ToUPlc a PLC.DefaultUni PLC.DefaultFun) - => [a] + => a -> ExceptT SomeException IO @@ -273,14 +284,13 @@ runPlcCekTrace , UPLC.CekExTally PLC.DefaultFun , UPLC.Term PLC.Name PLC.DefaultUni PLC.DefaultFun () ) -runPlcCekTrace values = do - ps <- traverse toUPlc values - let p = foldl1 (unsafeFromRight .* UPLC.applyProgram) ps +runPlcCekTrace value = do + term <- toUPlc value let (result, UPLC.TallyingSt tally _, logOut) = UPLC.runCek PLC.defaultCekParametersForTesting UPLC.tallying UPLC.logEmitter - (p ^. UPLC.progTerm) + (term ^. UPLC.progTerm) res <- fromRightM (throwError . SomeException) result pure (logOut, tally, res)