refactor deps

.stylish-haskell.yaml

@@ -0,0 +1,32 @@
+steps:
+
+  - simple_align:
+      cases: never
+      top_level_patterns: never
+      records: never
+      multi_way_if: never
+
+  - imports:
+      align: none
+      post_qualify: true
+
+  - language_pragmas:
+      remove_redundant: false
+
+  - trailing_whitespace: {}
+
+columns: 80
+
+newline: native
+
+language_extensions:
+  - GeneralizedNewtypeDeriving
+  - ImportQualifiedPost
+  - NumericUnderscores
+  - OverloadedStrings
+  - BangPatterns ## stylish-haskell reports an error when and expression starts with `!`
+  - TypeOperators ## stylish-haskell reports an error when importing type operators such as `import Prelude (type (~))`
+
+# stylish-haskell doesn't understand Cabal common-stanzas, so let's just
+# disable it.
+cabal: false

src/plutarch-onchain-lib/plutarch-onchain-lib.cabal

@@ -116,16 +116,10 @@ test-suite plutarch-onchain-lib-bench
   hs-source-dirs: test
   build-depends:
     , base
-    , bytestring
-    , cardano-crypto-class
     , plutarch              ==1.9.0
     , plutarch-ledger-api
     , plutarch-onchain-lib
     , plutarch-testlib
-    , plutus-core
     , plutus-ledger-api
     , plutus-tx
-    , quickcheck-instances
     , tasty
-    , tasty-hunit
-    , tasty-quickcheck

src/plutarch-onchain-lib/test/Bench.hs

@@ -8,33 +8,30 @@
 
 module Main (main) where
 
-import Plutarch.Core.FieldBinds
 import Plutarch.Core.List
 import Plutarch.Core.Unroll
 import Plutarch.Core.ValidationLogic
 import Plutarch.Internal.Lift
 import Plutarch.Internal.Term
 import Plutarch.LedgerApi.V3
 import Plutarch.Maybe
-import Plutarch.Monadic qualified as P
 import Plutarch.Prelude
 import Plutarch.Test.Bench
 import PlutusLedgerApi.V1.Address
 import PlutusLedgerApi.V1.Value
 import PlutusLedgerApi.V3 (Datum (..), OutputDatum (NoOutputDatum),
-                           PubKeyHash (..), Redeemer (..), ScriptContext (..),
-                           ScriptHash (..), ScriptInfo (SpendingScript),
-                           ScriptPurpose (..), TxId (..), TxInInfo (..),
-                           TxInfo (..), TxOut (..), TxOutRef (..), always)
+                           Redeemer (..), ScriptContext (..), ScriptHash (..),
+                           ScriptInfo (SpendingScript), ScriptPurpose (..),
+                           TxId (..), TxInInfo (..), TxInfo (..), TxOut (..),
+                           TxOutRef (..), always)
 import PlutusTx qualified
 import PlutusTx.AssocMap qualified as Map
-import PlutusTx.Builtins qualified as PlutusTx
 import Test.Tasty (TestTree, testGroup)
 
 -- | A very crude deterministic generator for 'ScriptContext's with size
 -- approximately proportional to the input integer.
-mkScriptContext :: Int -> ScriptContext
-mkScriptContext i =
+_mkScriptContext :: Int -> ScriptContext
+_mkScriptContext i =
   ScriptContext
     (mkTxInfo i)
     (Redeemer (PlutusTx.toBuiltinData (1 :: Integer)))
@@ -80,8 +77,8 @@ mkTxOut i = TxOut {
 mkValue :: Int -> Value
 mkValue i = assetClassValue (assetClass adaSymbol adaToken) (fromIntegral i)
 
-exampleContext :: ScriptContext
-exampleContext = mkScriptContext 100
+_exampleContext :: ScriptContext
+_exampleContext = _mkScriptContext 100
 
 exampleRedeemers :: Map.Map ScriptPurpose Redeemer
 exampleRedeemers = Map.unsafeFromList $ fmap (\x -> (mkScriptPurpose x, mkRedeemer x)) [1..100]

src/plutarch-onchain-lib/test/Plutarch/List/Test.hs

@@ -8,7 +8,7 @@ module Plutarch.List.Test(
 
 import Plutarch.Core.List
 import Plutarch.Prelude
-import Plutarch.Test.Unit (testEval, testEvalEqual, testEvalFail)
+import Plutarch.Test.Unit (testEvalEqual, testEvalFail)
 import Test.Tasty
 import Test.Tasty.HUnit
 

src/plutarch-onchain-lib/test/Plutarch/MerkleTree/Test.hs

@@ -6,51 +6,36 @@ module Plutarch.MerkleTree.Test(
   tests
 ) where
 
-import           Cardano.Crypto.DSIGN.Class           (deriveVerKeyDSIGN,
-                                                       rawDeserialiseSignKeyDSIGN,
-                                                       rawSerialiseSigDSIGN,
-                                                       rawSerialiseVerKeyDSIGN,
-                                                       signDSIGN)
-import           Cardano.Crypto.DSIGN.EcdsaSecp256k1  (EcdsaSecp256k1DSIGN,
-                                                       toMessageHash)
-import           Data.ByteString                      (ByteString)
-import qualified Data.ByteString                      as BS
-import           Numeric                              (readHex)
-import           Plutarch.Prelude
-import           Plutarch.Core.Crypto                 (pcompressPublicKey,
-                                                       pethereumPubKeyToPubKeyHash)
-import           Plutarch.Core.Eval                   (toBuiltinHexString)
-import           Plutarch.Core.Utils                  (pand'List,
-                                                       pintToByteString)
-import           Plutarch.Builtin.Crypto              (pblake2b_256,
-                                                       pverifyEcdsaSecp256k1Signature)
-import           Plutarch.MerkleTree.Helpers          (pcombine, pnibble,
-                                                       pnibbles, psuffix)
-import           Plutarch.MerkleTree.Merkling         (pmerkle_4, pnull_hash,
-                                                       pnull_hash_2,
-                                                       pnull_hash_4,
-                                                       pnull_hash_8)
-import           Plutarch.MerkleTree.PatriciaForestry (Neighbor (..),
-                                                       PMerklePatriciaForestry (..),
-                                                       PProof (..),
-                                                       PProofStep (..),
-                                                       ProofStep (..), pdelete,
-                                                       pfrom_root, phas,
-                                                       pinsert, pupdate)
-import Plutarch.LedgerApi.V3 (PAddress)                                                       
-import qualified Plutarch.Monadic                     as P
-import           Plutarch.Prelude
-import qualified PlutusCore.Crypto.Hash               as Hash
-import           PlutusLedgerApi.V2                   (Address (..),
-                                                       Credential (..))
-import           Test.QuickCheck.Instances.ByteString ()
-import           Test.Tasty
-import           Test.Tasty.HUnit
-import qualified Test.Tasty.QuickCheck                as QC
-import           Test.Tasty.QuickCheck                (Arbitrary (..), Gen,
-                                                       Property, forAll,
-                                                       vectorOf)
+import Cardano.Crypto.DSIGN.Class (deriveVerKeyDSIGN,
+                                   rawDeserialiseSignKeyDSIGN,
+                                   rawSerialiseSigDSIGN,
+                                   rawSerialiseVerKeyDSIGN, signDSIGN)
+import Cardano.Crypto.DSIGN.EcdsaSecp256k1 (EcdsaSecp256k1DSIGN, toMessageHash)
+import Data.ByteString (ByteString)
+import Data.ByteString qualified as BS
+import Numeric (readHex)
+import Plutarch.Builtin.Crypto (pblake2b_256, pverifyEcdsaSecp256k1Signature)
+import Plutarch.Core.Crypto (pcompressPublicKey, pethereumPubKeyToPubKeyHash)
+import Plutarch.Core.Eval (toBuiltinHexString)
+import Plutarch.Core.Utils (pand'List, pintToByteString)
+import Plutarch.LedgerApi.V3 (PAddress)
+import Plutarch.MerkleTree.Helpers (pcombine, pnibble, pnibbles, psuffix)
+import Plutarch.MerkleTree.Merkling (pmerkle_4, pnull_hash, pnull_hash_2,
+                                     pnull_hash_4, pnull_hash_8)
+import Plutarch.MerkleTree.PatriciaForestry (Neighbor (..),
+                                             PMerklePatriciaForestry (..),
+                                             PProof (..), PProofStep (..),
+                                             ProofStep (..), pdelete,
+                                             pfrom_root, phas, pinsert, pupdate)
+import Plutarch.Monadic qualified as P
+import Plutarch.Prelude
 import Plutarch.Test.Unit (testEval)
+import PlutusCore.Crypto.Hash qualified as Hash
+import PlutusLedgerApi.V2 (Address (..), Credential (..))
+import Test.QuickCheck.Instances.ByteString ()
+import Test.Tasty
+import Test.Tasty.QuickCheck (Arbitrary (..), Gen, Property, forAll, vectorOf)
+import Test.Tasty.QuickCheck qualified as QC
 
 tests :: TestTree
 tests = testGroup "Merkle tree"