Skip to content

Commit a117f71

Browse files
SeungheonOhSeungheonOh
authored
Fix faulty merge from #7231 (#7259)
This reverts commit e047551.
1 parent 6184806 commit a117f71

File tree

200 files changed

+3201
-2429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+3201
-2429
lines changed

‎.github/workflows/manual-benchmark.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ jobs:
123123
nix develop .#${{ steps.extract-benchmark.outputs.ghc }} \
124124
--no-warn-dirty \
125125
--accept-flake-config \
126-
--command bash ./scripts/ci-plutus-benchmark.sh
126+
--command taskset -c 7 bash ./scripts/ci-plutus-benchmark.sh
127+
# We use taskset to pin the benchmark to a single CPU core to improve repeatability
128+
127129
env:
128130
BENCHMARK_NAME: ${{ steps.extract-benchmark.outputs.benchmark }}
129131
PR_NUMBER: ${{ github.event.issue.number }}

‎cabal.project‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,7 @@ allow-newer:
9090
ral:QuickCheck,
9191
fin:QuickCheck,
9292
bin:QuickCheck,
93+
94+
-- https://github.com/IntersectMBO/plutus/pull/7236
95+
constraints: setup.optparse-applicative >=0.19.0.0
96+
allow-newer: turtle:optparse-applicative

‎cardano-constitution/cardano-constitution.cabal‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: cardano-constitution
3-
version: 1.49.0.0
3+
version: 1.51.0.0
44
license: Apache-2.0
55
license-files:
66
LICENSE
@@ -86,10 +86,10 @@ library
8686
, base >=4.9 && <5
8787
, containers
8888
, filepath
89-
, plutus-core ^>=1.49
90-
, plutus-ledger-api ^>=1.49
91-
, plutus-tx ^>=1.49
92-
, plutus-tx-plugin ^>=1.49
89+
, plutus-core ^>=1.51
90+
, plutus-ledger-api ^>=1.51
91+
, plutus-tx ^>=1.51
92+
, plutus-tx-plugin ^>=1.51
9393
, regex-tdfa
9494
, safe
9595
, template-haskell
@@ -132,10 +132,10 @@ test-suite cardano-constitution-test
132132
, containers
133133
, directory
134134
, filepath
135-
, plutus-core ^>=1.49
135+
, plutus-core ^>=1.51
136136
, plutus-core:plutus-core-testlib
137-
, plutus-ledger-api ^>=1.49
138-
, plutus-tx ^>=1.49
137+
, plutus-ledger-api ^>=1.51
138+
, plutus-tx ^>=1.51
139139
, QuickCheck
140140
, serialise
141141
, tasty
@@ -152,4 +152,4 @@ executable create-json-envelope
152152
build-depends:
153153
, base
154154
, cardano-constitution
155-
, plutus-ledger-api ^>=1.49
155+
, plutus-ledger-api ^>=1.51

‎cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.pir.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ program
515515
a = pair data data
516516
in
517517
/\r ->
518-
\(z : r) (f : a -> list a -> r) (xs : list a) -> case r xs [z, f])
518+
\(z : r) (f : a -> list a -> r) (xs : list a) -> case r xs [f, z])
519519
{List (Tuple2 data data)}
520520
(Nil {Tuple2 data data})
521521
(\(x : pair data data) (xs : list (pair data data)) ->

‎cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.uplc.golden‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -866,8 +866,7 @@ program
866866
(\xs ->
867867
case
868868
xs
869-
[ (constr 0 [])
870-
, (\x xs ->
869+
[ (\x xs ->
871870
constr 1
872871
[ (constr 0
873872
[ (force (force fstPair)
@@ -876,7 +875,8 @@ program
876875
x) ])
877876
, (force
878877
(s s (delay (\x -> x)))
879-
xs) ]) ]))
878+
xs) ])
879+
, (constr 0 []) ]))
880880
(delay (\x -> x))))
881881
((\s -> s s)
882882
(\s ds cparams ->

‎cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.pir.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ program
444444
a = pair data data
445445
in
446446
/\r ->
447-
\(z : r) (f : a -> list a -> r) (xs : list a) -> case r xs [z, f])
447+
\(z : r) (f : a -> list a -> r) (xs : list a) -> case r xs [f, z])
448448
{List (Tuple2 data data)}
449449
(Nil {Tuple2 data data})
450450
(\(x : pair data data) (xs : list (pair data data)) ->

‎cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.uplc.golden‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -912,14 +912,14 @@ program
912912
(\xs ->
913913
case
914914
xs
915-
[ (constr 0 [])
916-
, (\x xs ->
915+
[ (\x xs ->
917916
constr 1
918917
[ (constr 0
919918
[ (force (force fstPair) x)
920919
, (force (force sndPair) x) ])
921920
, (force (s s (delay (\x -> x)))
922-
xs) ]) ]))
921+
xs) ])
922+
, (constr 0 []) ]))
923923
(delay (\x -> x))))
924924
(cse (\arg_0 arg_1 -> arg_1)))
925925
(cse (\arg_0 arg_1 -> arg_0)))

‎cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.pir.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ program
491491
a = pair data data
492492
in
493493
/\r ->
494-
\(z : r) (f : a -> list a -> r) (xs : list a) -> case r xs [z, f])
494+
\(z : r) (f : a -> list a -> r) (xs : list a) -> case r xs [f, z])
495495
{List (Tuple2 data data)}
496496
(Nil {Tuple2 data data})
497497
(\(x : pair data data) (xs : list (pair data data)) ->

‎cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.uplc.golden‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -863,8 +863,7 @@ program
863863
(\xs ->
864864
case
865865
xs
866-
[ (constr 0 [])
867-
, (\x xs ->
866+
[ (\x xs ->
868867
constr 1
869868
[ (constr 0
870869
[ (force (force fstPair)
@@ -873,7 +872,8 @@ program
873872
x) ])
874873
, (force
875874
(s s (delay (\x -> x)))
876-
xs) ]) ]))
875+
xs) ])
876+
, (constr 0 []) ]))
877877
(delay (\x -> x))))
878878
((\s -> s s)
879879
(\s ds cparams ->

‎cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.pir.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ program
420420
a = pair data data
421421
in
422422
/\r ->
423-
\(z : r) (f : a -> list a -> r) (xs : list a) -> case r xs [z, f])
423+
\(z : r) (f : a -> list a -> r) (xs : list a) -> case r xs [f, z])
424424
{List (Tuple2 data data)}
425425
(Nil {Tuple2 data data})
426426
(\(x : pair data data) (xs : list (pair data data)) ->

0 commit comments

Comments
 (0)