better defaulting to allow to pay integers

tweag · May 22, 2024 · 17bb134 · 17bb134
1 parent 8a254e2
commit 17bb134
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 37 deletions.
diff --git a/cooked-validators.cabal b/cooked-validators.cabal
@@ -64,6 +64,7 @@ library
       DataKinds
       DerivingStrategies
       DerivingVia
+      ExtendedDefaultRules
       FlexibleContexts
       FlexibleInstances
       GADTs
@@ -153,6 +154,7 @@ test-suite spec
   default-extensions:
       ImportQualifiedPost
       DataKinds
+      ExtendedDefaultRules
       FlexibleContexts
       FlexibleInstances
       GADTs

diff --git a/package.yaml b/package.yaml
@@ -54,6 +54,7 @@ library:
     - DataKinds
     - DerivingStrategies
     - DerivingVia
+    - ExtendedDefaultRules
     - FlexibleContexts
     - FlexibleInstances
     - GADTs
@@ -88,6 +89,7 @@ tests:
     default-extensions:
       - ImportQualifiedPost
       - DataKinds
+      - ExtendedDefaultRules
       - FlexibleContexts
       - FlexibleInstances
       - GADTs

diff --git a/tests/Cooked/BasicUsageSpec.hs b/tests/Cooked/BasicUsageSpec.hs
@@ -47,7 +47,7 @@ payToAlwaysTrueValidator =
   head
     <$> ( validateTxSkel' $
             txSkelTemplate
-              { txSkelOuts = [paysScript (alwaysTrueValidator @MockContract) () (10 :: Integer)],
+              { txSkelOuts = [paysScript (alwaysTrueValidator @MockContract) () 10],
                 txSkelSigners = [alice]
               }
         )
@@ -59,7 +59,7 @@ consumeAlwaysTrueValidator = do
     validateTxSkel $
       txSkelTemplate
         { txSkelIns = Map.fromList [(outref, TxSkelRedeemerForScript ())],
-          txSkelOuts = [paysPK alice (10 :: Integer)],
+          txSkelOuts = [paysPK alice 10],
           txSkelSigners = [alice]
         }
 

diff --git a/tests/Cooked/InitialDistributionSpec.hs b/tests/Cooked/InitialDistributionSpec.hs
@@ -15,17 +15,13 @@ bob = wallet 2
 -- | An initial distribution where alice owns a UTxO with a datum of
 -- type Int and value 10 for each datum kind
 initialDistributionWithDatum =
-  InitialDistribution $
-    (\f -> f (paysPK alice (2 :: Integer)) 10)
-      <$> [withDatum @Integer, withInlineDatum, withDatumHash]
+  InitialDistribution $ [withDatum, withInlineDatum, withDatumHash] <*> [paysPK alice 2] <*> [10]
 
 -- | An initial distribution where alice owns a UTxO with a reference
 -- script corresponding to the always succeed validators and bob owns
 -- 2 UTxOs with 100 ada
 initialDistributionWithReferenceScript =
-  InitialDistribution $
-    (paysPK alice (2 :: Integer) `withReferenceScript` alwaysTrueValidator @MockContract)
-      : replicate 2 (paysPK bob (100 :: Integer))
+  InitialDistribution $ (paysPK alice 2 `withReferenceScript` alwaysTrueValidator @MockContract) : replicate 2 (paysPK bob 100)
 
 getValueFromInitialDatum :: (MonadBlockChain m) => m [Integer]
 getValueFromInitialDatum = do
@@ -38,13 +34,13 @@ spendReferenceAlwaysTrueValidator = do
   (scriptTxOutRef : _) <-
     validateTxSkel' $
       txSkelTemplate
-        { txSkelOuts = [paysScript (alwaysTrueValidator @MockContract) () (2 :: Integer)],
+        { txSkelOuts = [paysScript (alwaysTrueValidator @MockContract) () 2],
           txSkelSigners = [bob]
         }
   void $
     validateTxSkel $
       txSkelTemplate
-        { txSkelOuts = [paysPK alice (2 :: Integer)],
+        { txSkelOuts = [paysPK alice 2],
           txSkelIns = Map.singleton scriptTxOutRef (TxSkelRedeemerForReferencedScript referenceScriptTxOutRef ()),
           txSkelSigners = [bob]
         }

diff --git a/tests/Cooked/InlineDatumsSpec.hs b/tests/Cooked/InlineDatumsSpec.hs
@@ -103,7 +103,7 @@ listUtxosTestTrace useInlineDatum validator =
     <$> validateTxSkel
       txSkelTemplate
         { txSkelOpts = def {txOptEnsureMinAda = True},
-          txSkelOuts = [(if useInlineDatum then paysScriptInlineDatum validator else paysScript validator) FirstPaymentDatum (3 :: Integer)],
+          txSkelOuts = [(if useInlineDatum then paysScriptInlineDatum validator else paysScript validator) FirstPaymentDatum 3],
           txSkelSigners = [wallet 1]
         }
 

diff --git a/tests/Cooked/MinAdaSpec.hs b/tests/Cooked/MinAdaSpec.hs
@@ -19,7 +19,7 @@ paymentWithMinAda = do
     <$> validateTxSkel
       txSkelTemplate
         { txSkelOpts = def {txOptEnsureMinAda = True},
-          txSkelOuts = [paysPK (wallet 2) (0 :: Integer) `withDatum` heavyDatum],
+          txSkelOuts = [paysPK (wallet 2) 0 `withDatum` heavyDatum],
           txSkelSigners = [wallet 1]
         }
 

diff --git a/tests/Cooked/ReferenceInputsSpec.hs b/tests/Cooked/ReferenceInputsSpec.hs
@@ -95,8 +95,8 @@ trace1 = do
     validateTxSkel'
       txSkelTemplate
         { txSkelOuts =
-            [ paysScriptInlineDatum fooTypedValidator (FooDatum (walletPKHash (wallet 3))) (4 :: Integer),
-              paysScript barTypedValidator () (5 :: Integer)
+            [ paysScriptInlineDatum fooTypedValidator (FooDatum (walletPKHash (wallet 3))) 4,
+              paysScript barTypedValidator () 5
             ],
           txSkelSigners = [wallet 2]
         }
@@ -105,7 +105,7 @@ trace1 = do
       txSkelTemplate
         { txSkelIns = Map.singleton txOutRefBar $ TxSkelRedeemerForScript (),
           txSkelInsReference = Set.singleton txOutRefFoo,
-          txSkelOuts = [paysPK (wallet 4) (5 :: Integer)],
+          txSkelOuts = [paysPK (wallet 4) 5],
           txSkelSigners = [wallet 3]
         }
 

diff --git a/tests/Cooked/ReferenceScriptsSpec.hs b/tests/Cooked/ReferenceScriptsSpec.hs
@@ -98,7 +98,7 @@ checkReferenceScriptOnOref expectedScriptHash refScriptOref = do
   oref : _ <-
     validateTxSkel'
       txSkelTemplate
-        { txSkelOuts = [paysScript (requireRefScriptValidator (expectedScriptHash, "there is no reference input with the correct script hash")) () (42 :: Integer)],
+        { txSkelOuts = [paysScript (requireRefScriptValidator (expectedScriptHash, "there is no reference input with the correct script hash")) () 42],
           txSkelSigners = [wallet 1]
         }
   void $
@@ -115,7 +115,7 @@ useReferenceScript spendingSubmitter theScript = do
   oref : _ <-
     validateTxSkel'
       txSkelTemplate
-        { txSkelOuts = [paysScript theScript () (42 :: Integer)],
+        { txSkelOuts = [paysScript theScript () 42],
           txSkelSigners = [wallet 1]
         }
   void $
@@ -192,11 +192,11 @@ tests =
               )
               def
             $ do
-              (consumedOref, _) : _ <- runUtxoSearch $ utxosAtSearch (wallet 1) *+* pureBoolFilter ((`Script.geq` toValue (42 :: Integer)) . outputValue)
+              (consumedOref, _) : _ <- runUtxoSearch $ utxosAtSearch (wallet 1) *+* pureBoolFilter ((`Script.geq` toValue 42) . outputValue)
               oref : _ <-
                 validateTxSkel'
                   txSkelTemplate
-                    { txSkelOuts = [paysScript (alwaysTrueValidator @MockContract) () (42 :: Integer)],
+                    { txSkelOuts = [paysScript (alwaysTrueValidator @MockContract) () 42],
                       txSkelIns = Map.singleton consumedOref TxSkelNoRedeemerForPK,
                       txSkelSigners = [wallet 1]
                     }
@@ -221,7 +221,7 @@ tests =
                     oref : _ <-
                       validateTxSkel'
                         txSkelTemplate
-                          { txSkelOuts = [paysScript (alwaysTrueValidator @MockContract) () (42 :: Integer)],
+                          { txSkelOuts = [paysScript (alwaysTrueValidator @MockContract) () 42],
                             txSkelSigners = [wallet 1]
                           }
                     void $
@@ -244,7 +244,7 @@ tests =
               oref : _ <-
                 validateTxSkel'
                   txSkelTemplate
-                    { txSkelOuts = [paysScript (alwaysTrueValidator @MockContract) () (42 :: Integer)],
+                    { txSkelOuts = [paysScript (alwaysTrueValidator @MockContract) () 42],
                       txSkelSigners = [wallet 1]
                     }
               void $

diff --git a/tests/Cooked/ShowBSSpec.hs b/tests/Cooked/ShowBSSpec.hs
@@ -41,7 +41,7 @@ printTrace = do
     validateTxSkel'
       txSkelTemplate
         { txSkelSigners = [wallet 1],
-          txSkelOuts = [paysScriptInlineDatum printValidator () (30 :: Integer)]
+          txSkelOuts = [paysScriptInlineDatum printValidator () 30]
         }
   void $
     validateTxSkel

diff --git a/tests/Cooked/Tweak/TamperDatumSpec.hs b/tests/Cooked/Tweak/TamperDatumSpec.hs
@@ -23,9 +23,9 @@ tamperDatumTweakTest =
           txSkelTemplate
             { txSkelLabel = Set.singleton $ TxLabel TamperDatumLbl,
               txSkelOuts =
-                [ paysPK alice (Script.Lovelace 789) `withDatum` (52 :: Integer, 54 :: Integer),
+                [ paysPK alice (Script.Lovelace 789) `withDatum` (52, 54),
                   paysPK alice (Script.Lovelace 234) `withDatum` (),
-                  paysPK alice (Script.Lovelace 567) `withDatum` (76 :: Integer, 77 :: Integer)
+                  paysPK alice (Script.Lovelace 567) `withDatum` (76, 77)
                 ]
             }
         )
@@ -36,9 +36,9 @@ tamperDatumTweakTest =
         )
         ( txSkelTemplate
             { txSkelOuts =
-                [ paysPK alice (Script.Lovelace 789) `withDatum` (52 :: Integer, 53 :: Integer),
+                [ paysPK alice (Script.Lovelace 789) `withDatum` (52, 53),
                   paysPK alice (Script.Lovelace 234) `withDatum` (),
-                  paysPK alice (Script.Lovelace 567) `withDatum` (76 :: Integer, 77 :: Integer)
+                  paysPK alice (Script.Lovelace 567) `withDatum` (76, 77)
                 ]
             }
         )
@@ -54,20 +54,20 @@ malformDatumTweakTest =
                   txSkelOuts =
                     [ paysPK alice (Script.Lovelace 789) `withDatum` PlutusTx.toBuiltinData datum1,
                       paysPK alice (Script.Lovelace 234) `withDatum` (),
-                      paysPK alice (Script.Lovelace 567) `withDatum` (76 :: Integer, 77 :: Integer),
+                      paysPK alice (Script.Lovelace 567) `withDatum` (76, 77),
                       paysPK alice (Script.Lovelace 567) `withDatum` PlutusTx.toBuiltinData datum4
                     ]
                 }
             )
      in assertSameSets
-          [ txSkelWithDatums1And4 (52 :: Integer, ()) (84 :: Integer, 85 :: Integer), -- datum1 changed, datum4 untouched
-            txSkelWithDatums1And4 False (84 :: Integer, 85 :: Integer), -- datum1 changed, datum4 untouched
-            txSkelWithDatums1And4 (52 :: Integer, ()) (84 :: Integer, ()), -- datum1 changed, datum4 as well
+          [ txSkelWithDatums1And4 (52, ()) (84, 85), -- datum1 changed, datum4 untouched
+            txSkelWithDatums1And4 False (84, 85), -- datum1 changed, datum4 untouched
+            txSkelWithDatums1And4 (52, ()) (84, ()), -- datum1 changed, datum4 as well
             txSkelWithDatums1And4 False False, -- datum1 changed, datum4 as well
-            txSkelWithDatums1And4 (52 :: Integer, ()) False, -- datum1 changed, datum4 as well
-            txSkelWithDatums1And4 False (84 :: Integer, ()), -- datum1 changed, datum4 as well
-            txSkelWithDatums1And4 (52 :: Integer, 53 :: Integer) (84 :: Integer, ()), -- datum1 untouched, datum4 changed
-            txSkelWithDatums1And4 (52 :: Integer, 53 :: Integer) False -- datum1 untouched, datum4 changed
+            txSkelWithDatums1And4 (52, ()) False, -- datum1 changed, datum4 as well
+            txSkelWithDatums1And4 False (84, ()), -- datum1 changed, datum4 as well
+            txSkelWithDatums1And4 (52, 53) (84, ()), -- datum1 untouched, datum4 changed
+            txSkelWithDatums1And4 (52, 53) False -- datum1 untouched, datum4 changed
           ]
           ( runTweak
               ( malformDatumTweak @(Integer, Integer)
@@ -82,10 +82,10 @@ malformDatumTweakTest =
               )
               ( txSkelTemplate
                   { txSkelOuts =
-                      [ paysPK alice (Script.Lovelace 789) `withDatum` (52 :: Integer, 53 :: Integer),
+                      [ paysPK alice (Script.Lovelace 789) `withDatum` (52, 53),
                         paysPK alice (Script.Lovelace 234) `withDatum` (),
-                        paysPK alice (Script.Lovelace 567) `withDatum` (76 :: Integer, 77 :: Integer),
-                        paysPK alice (Script.Lovelace 567) `withDatum` (84 :: Integer, 85 :: Integer)
+                        paysPK alice (Script.Lovelace 567) `withDatum` (76, 77),
+                        paysPK alice (Script.Lovelace 567) `withDatum` (84, 85)
                       ]
                   }
               )