Skip to content

Commit 64d3e90

Browse files
UnisayUnisay
committed
Compare CompiledCode with Haskell directly
1 parent 3261543 commit 64d3e90

File tree

9 files changed

+469
-643
lines changed

9 files changed

+469
-643
lines changed

‎plutus-ledger-api/test-plugin/Spec/Data/MintValue/V3.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import PlutusTx.Code (CompiledCode, unsafeApplyCode)
2626
import PlutusTx.Data.AssocMap qualified as Map
2727
import PlutusTx.Data.List qualified as List
2828
import PlutusTx.Lift (liftCodeDef)
29-
import PlutusTx.Test.Util.Compiled (cekResultMatchesHaskellValue, compiledCodeToTerm)
29+
import PlutusTx.Test.Run.Code (evaluationResultMatchesHaskell)
3030
import PlutusTx.TH (compile)
3131
import Prelude qualified as Haskell
3232
import Test.QuickCheck qualified as QC
@@ -148,5 +148,4 @@ scaleTestsBy factor =
148148
QC.withMaxSuccess (100 Haskell.* factor) . QC.mapSize (Haskell.* factor)
149149

150150
cekProp :: CompiledCode Bool -> Property
151-
cekProp code =
152-
cekResultMatchesHaskellValue (compiledCodeToTerm code) (===) True
151+
cekProp code = evaluationResultMatchesHaskell code (===) True

‎plutus-ledger-api/test-plugin/Spec/MintValue/V3.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import PlutusTx.AssocMap qualified as Map
2626
import PlutusTx.Code (CompiledCode, unsafeApplyCode)
2727
import PlutusTx.Lift (liftCodeDef)
2828
import PlutusTx.List qualified as List
29-
import PlutusTx.Test.Util.Compiled (cekResultMatchesHaskellValue, compiledCodeToTerm)
29+
import PlutusTx.Test.Run.Code (evaluationResultMatchesHaskell)
3030
import PlutusTx.TH (compile)
3131
import Prelude qualified as Haskell
3232
import Test.QuickCheck qualified as QC
@@ -148,5 +148,5 @@ scaleTestsBy factor =
148148
QC.withMaxSuccess (100 Haskell.* factor) . QC.mapSize (Haskell.* factor)
149149

150150
cekProp :: CompiledCode Bool -> Property
151-
cekProp code =
152-
cekResultMatchesHaskellValue (compiledCodeToTerm code) (===) True
151+
cekProp code = evaluationResultMatchesHaskell code (===) True
152+

‎plutus-ledger-api/test-plugin/Spec/Value/WithCurrencySymbol.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import PlutusTx.AssocMap qualified as Map
2929
import PlutusTx.Code (CompiledCode, unsafeApplyCode)
3030
import PlutusTx.Lift (liftCodeDef)
3131
import PlutusTx.List qualified as List
32-
import PlutusTx.Test.Util.Compiled (cekResultMatchesHaskellValue, compiledCodeToTerm)
32+
import PlutusTx.Test.Run.Code (evaluationResultMatchesHaskell)
3333
import PlutusTx.TH (compile)
3434
import Prelude qualified as Haskell
3535
import Test.QuickCheck
@@ -107,8 +107,7 @@ scaleTestsBy factor =
107107
withMaxSuccess (100 Haskell.* factor) . mapSize (Haskell.* factor)
108108

109109
cekProp :: CompiledCode Bool -> Property
110-
cekProp code =
111-
cekResultMatchesHaskellValue (compiledCodeToTerm code) (===) True
110+
cekProp code = evaluationResultMatchesHaskell code (===) True
112111

113112
instance Arbitrary CurrencySymbol where
114113
arbitrary = Haskell.fmap currencySymbol (arbitraryBuiltin @ByteString)

‎plutus-tx-plugin/test/AssocMap/Properties1.hs

Lines changed: 52 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ module AssocMap.Properties1 where
2222
import Hedgehog (Property, forAll, property, (===))
2323
import Hedgehog.Gen qualified as Gen
2424
import PlutusTx.AssocMap qualified as AssocMap
25-
import PlutusTx.Code
25+
import PlutusTx.Code (CompiledCode, unsafeApplyCode)
2626
import PlutusTx.Data.AssocMap qualified as Data.AssocMap
2727
import PlutusTx.IsData ()
2828
import PlutusTx.Lift (liftCodeDef)
2929
import PlutusTx.List qualified as PlutusTx
3030
import PlutusTx.Prelude qualified as PlutusTx
31-
import PlutusTx.Test.Util.Compiled (cekResultMatchesHaskellValue, compiledCodeToTerm)
31+
import PlutusTx.Test.Run.Code (evaluationResultMatchesHaskell)
3232
import PlutusTx.TH (compile)
3333

3434
import AssocMap.Semantics
@@ -110,7 +110,7 @@ allProgram
110110
-> Bool
111111
)
112112
allProgram =
113-
$$(compile [||\num m -> AssocMap.all (\x -> x PlutusTx.< num) m||])
113+
$$(compile [||\num m -> AssocMap.all (PlutusTx.< num) m||])
114114

115115
dataAllProgram
116116
:: CompiledCode
@@ -119,7 +119,7 @@ dataAllProgram
119119
-> Bool
120120
)
121121
dataAllProgram =
122-
$$(compile [||\num m -> Data.AssocMap.all (\x -> x PlutusTx.< num) m||])
122+
$$(compile [||\num m -> Data.AssocMap.all (PlutusTx.< num) m||])
123123

124124
dataAnyProgram
125125
:: CompiledCode
@@ -128,7 +128,7 @@ dataAnyProgram
128128
-> Bool
129129
)
130130
dataAnyProgram =
131-
$$(compile [||\num m -> Data.AssocMap.any (\x -> x PlutusTx.< num) m||])
131+
$$(compile [||\num m -> Data.AssocMap.any (PlutusTx.< num) m||])
132132

133133
lookupSpec :: Property
134134
lookupSpec = property $ do
@@ -137,19 +137,17 @@ lookupSpec = property $ do
137137
let assocMap = semanticsToAssocMap assocMapS
138138
dataAssocMap = semanticsToDataAssocMap assocMapS
139139
expected = lookupS key assocMapS
140-
cekResultMatchesHaskellValue
141-
( compiledCodeToTerm $
142-
lookupProgram
143-
`unsafeApplyCode` (liftCodeDef key)
144-
`unsafeApplyCode` (liftCodeDef assocMap)
140+
evaluationResultMatchesHaskell
141+
( lookupProgram
142+
`unsafeApplyCode` liftCodeDef key
143+
`unsafeApplyCode` liftCodeDef assocMap
145144
)
146145
(===)
147146
expected
148-
cekResultMatchesHaskellValue
149-
( compiledCodeToTerm $
150-
dataLookupProgram
151-
`unsafeApplyCode` (liftCodeDef key)
152-
`unsafeApplyCode` (liftCodeDef dataAssocMap)
147+
evaluationResultMatchesHaskell
148+
( dataLookupProgram
149+
`unsafeApplyCode` liftCodeDef key
150+
`unsafeApplyCode` liftCodeDef dataAssocMap
153151
)
154152
(===)
155153
expected
@@ -161,19 +159,18 @@ memberSpec = property $ do
161159
let assocMap = semanticsToAssocMap assocMapS
162160
dataAssocMap = semanticsToDataAssocMap assocMapS
163161
expected = memberS key assocMapS
164-
cekResultMatchesHaskellValue
165-
( compiledCodeToTerm $
166-
memberProgram
167-
`unsafeApplyCode` (liftCodeDef key)
168-
`unsafeApplyCode` (liftCodeDef assocMap)
162+
163+
evaluationResultMatchesHaskell
164+
( memberProgram
165+
`unsafeApplyCode` liftCodeDef key
166+
`unsafeApplyCode` liftCodeDef assocMap
169167
)
170168
(===)
171169
expected
172-
cekResultMatchesHaskellValue
173-
( compiledCodeToTerm $
174-
dataMemberProgram
175-
`unsafeApplyCode` (liftCodeDef key)
176-
`unsafeApplyCode` (liftCodeDef dataAssocMap)
170+
evaluationResultMatchesHaskell
171+
( dataMemberProgram
172+
`unsafeApplyCode` liftCodeDef key
173+
`unsafeApplyCode` liftCodeDef dataAssocMap
177174
)
178175
(===)
179176
expected
@@ -186,21 +183,19 @@ insertSpec = property $ do
186183
let assocMap = semanticsToAssocMap assocMapS
187184
dataAssocMap = semanticsToDataAssocMap assocMapS
188185
expected = sortS $ insertS key value assocMapS
189-
cekResultMatchesHaskellValue
190-
( compiledCodeToTerm $
191-
insertProgram
192-
`unsafeApplyCode` (liftCodeDef key)
193-
`unsafeApplyCode` (liftCodeDef value)
194-
`unsafeApplyCode` (liftCodeDef assocMap)
186+
evaluationResultMatchesHaskell
187+
( insertProgram
188+
`unsafeApplyCode` liftCodeDef key
189+
`unsafeApplyCode` liftCodeDef value
190+
`unsafeApplyCode` liftCodeDef assocMap
195191
)
196192
(===)
197193
expected
198-
cekResultMatchesHaskellValue
199-
( compiledCodeToTerm $
200-
dataInsertProgram
201-
`unsafeApplyCode` (liftCodeDef key)
202-
`unsafeApplyCode` (liftCodeDef value)
203-
`unsafeApplyCode` (liftCodeDef dataAssocMap)
194+
evaluationResultMatchesHaskell
195+
( dataInsertProgram
196+
`unsafeApplyCode` liftCodeDef key
197+
`unsafeApplyCode` liftCodeDef value
198+
`unsafeApplyCode` liftCodeDef dataAssocMap
204199
)
205200
(===)
206201
expected
@@ -212,19 +207,17 @@ deleteSpec = property $ do
212207
let assocMap = semanticsToAssocMap assocMapS
213208
dataAssocMap = semanticsToDataAssocMap assocMapS
214209
expected = sortS $ deleteS key assocMapS
215-
cekResultMatchesHaskellValue
216-
( compiledCodeToTerm $
217-
deleteProgram
218-
`unsafeApplyCode` (liftCodeDef key)
219-
`unsafeApplyCode` (liftCodeDef assocMap)
210+
evaluationResultMatchesHaskell
211+
( deleteProgram
212+
`unsafeApplyCode` liftCodeDef key
213+
`unsafeApplyCode` liftCodeDef assocMap
220214
)
221215
(===)
222216
expected
223-
cekResultMatchesHaskellValue
224-
( compiledCodeToTerm $
225-
dataDeleteProgram
226-
`unsafeApplyCode` (liftCodeDef key)
227-
`unsafeApplyCode` (liftCodeDef dataAssocMap)
217+
evaluationResultMatchesHaskell
218+
( dataDeleteProgram
219+
`unsafeApplyCode` liftCodeDef key
220+
`unsafeApplyCode` liftCodeDef dataAssocMap
228221
)
229222
(===)
230223
expected
@@ -236,19 +229,17 @@ allSpec = property $ do
236229
let assocMap = semanticsToAssocMap assocMapS
237230
dataAssocMap = semanticsToDataAssocMap assocMapS
238231
expected = allS (< num) assocMapS
239-
cekResultMatchesHaskellValue
240-
( compiledCodeToTerm $
241-
allProgram
242-
`unsafeApplyCode` (liftCodeDef num)
243-
`unsafeApplyCode` (liftCodeDef assocMap)
232+
evaluationResultMatchesHaskell
233+
( allProgram
234+
`unsafeApplyCode` liftCodeDef num
235+
`unsafeApplyCode` liftCodeDef assocMap
244236
)
245237
(===)
246238
expected
247-
cekResultMatchesHaskellValue
248-
( compiledCodeToTerm $
249-
dataAllProgram
250-
`unsafeApplyCode` (liftCodeDef num)
251-
`unsafeApplyCode` (liftCodeDef dataAssocMap)
239+
evaluationResultMatchesHaskell
240+
( dataAllProgram
241+
`unsafeApplyCode` liftCodeDef num
242+
`unsafeApplyCode` liftCodeDef dataAssocMap
252243
)
253244
(===)
254245
expected
@@ -259,11 +250,10 @@ anySpec = property $ do
259250
num <- forAll $ Gen.integral rangeElem
260251
let dataAssocMap = semanticsToDataAssocMap assocMapS
261252
expected = anyS (< num) assocMapS
262-
cekResultMatchesHaskellValue
263-
( compiledCodeToTerm $
264-
dataAnyProgram
265-
`unsafeApplyCode` (liftCodeDef num)
266-
`unsafeApplyCode` (liftCodeDef dataAssocMap)
253+
evaluationResultMatchesHaskell
254+
( dataAnyProgram
255+
`unsafeApplyCode` liftCodeDef num
256+
`unsafeApplyCode` liftCodeDef dataAssocMap
267257
)
268258
(===)
269259
expected

0 commit comments

Comments
 (0)