Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Builtins] Unlift both ways #4516

Merged
merged 18 commits into from
Apr 7, 2022
Merged

[Builtins] Unlift both ways #4516

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c1030cc
[Builtins] Defer 'readKnown' until full saturation
effectfully Feb 26, 2022
ae0a821
Use 'UnliftWhenSaturated' instead of 'UnliftImmediately'
effectfully Mar 2, 2022
4388d6c
Revert "Use 'UnliftWhenSaturated' instead of 'UnliftImmediately'"
effectfully Mar 2, 2022
932756a
Correct causes for unlifting errors
effectfully Mar 9, 2022
6c9a09a
Use 'UnliftWhenSaturated' instead of 'UnliftImmediately'
effectfully Mar 9, 2022
f4a237c
Playing with bangs
effectfully Mar 9, 2022
e3073ec
Remove a bang
effectfully Mar 9, 2022
046cf60
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully Mar 28, 2022
b6743db
Parallel 'TypeScheme' and 'RuntimeScheme'
effectfully Mar 30, 2022
5d3fb5a
Drop immediate unlifting
effectfully Mar 30, 2022
718499a
Drop redundant laziness annotations
effectfully Mar 30, 2022
f070979
Integrate immediate unlifting
effectfully Apr 1, 2022
ba403c3
Fix tests
effectfully Apr 1, 2022
50d93e7
And now with deferred unlifting
effectfully Apr 1, 2022
3b26af5
Docs and fixes and a test
effectfully Apr 5, 2022
e80dbb7
Compile both the ways of doing unlifting
effectfully Apr 6, 2022
540c0cb
More docs
effectfully Apr 6, 2022
64f3e9a
And a bit more
effectfully Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix tests
  • Loading branch information
@effectfully
effectfully committed Apr 1, 2022
commit ba403c3fcb7457ff91706f2e3685d8ccf3a93a48
3 changes: 2 additions & 1 deletion plutus-core/untyped-plutus-core/test/Evaluation/Builtins/Definition.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ import Test.Tasty.Hedgehog
defaultCekParametersExt
:: MachineParameters CekMachineCosts CekValue DefaultUni (Either DefaultFun ExtensionFun)
defaultCekParametersExt =
mkMachineParameters $ CostModel defaultCekMachineCosts (defaultBuiltinCostModel, ())
mkMachineParameters defaultUnliftingMode $
CostModel defaultCekMachineCosts (defaultBuiltinCostModel, ())

-- | Check that 'Factorial' from the above computes to the same thing as
-- a factorial defined in PLC itself.
Expand Down
8 changes: 4 additions & 4 deletions plutus-core/untyped-plutus-core/test/Evaluation/Golden/iteAtIntegerWrongCondType.plc.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(Right [
[ (force (builtin ifThenElse)) (con string "11 <= 22") ]
(con string "\172(11 <= 22)")
])
(Left An error has occurred: error:
Could not unlift a builtin:
Type mismatch: expected: bool; actual: string
Caused by: (con string "11 <= 22"))
8 changes: 4 additions & 4 deletions plutus-core/untyped-plutus-core/test/Evaluation/Golden/iteAtIntegerWrongCondType.uplc.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(Right [
[ (force (builtin ifThenElse)) (con string "11 <= 22") ]
(con string "\172(11 <= 22)")
])
(Left An error has occurred: error:
Could not unlift a builtin:
Type mismatch: expected: bool; actual: string
Caused by: (con string "11 <= 22"))
2 changes: 1 addition & 1 deletion plutus-core/untyped-plutus-core/test/Evaluation/Machines.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ test_budget
. testNested "Budget"
$ concat
[ folder Plc.defaultBuiltinsRuntime bunchOfFibs
, folder (toBuiltinsRuntime ()) bunchOfIdNats
, folder (toBuiltinsRuntime Plc.defaultUnliftingMode ()) bunchOfIdNats
, folder Plc.defaultBuiltinsRuntime bunchOfIfThenElseNats
]
where
Expand Down