Skip to content
This repository was archived by the owner on Nov 26, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,6 @@ allow-newer: servant-client-core:*
allow-newer: servant-client:*
allow-newer: servant:*
allow-newer: tasty-wai:*
allow-newer: *:hashable

tests: True
4 changes: 2 additions & 2 deletions pact-tests/Pact/Core/Test/SizeOfTests.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module Pact.Core.Test.SizeOfTests where
import Data.Default
import Control.Monad.IO.Class
import qualified Data.Map as Map
import Data.Text
import qualified Data.Text as T
import Test.Tasty (TestTree, testGroup)
import Test.Tasty.HUnit

Expand All @@ -28,7 +28,7 @@ tests = testGroup "SizeOfTests" $
Right size <- getSize SizeOfV0 (1 :: Int)
assertEqual "size should be 5" 5 size
, testCase "string" $ do
Right size <- getSize SizeOfV0 ("a" :: Text)
Right size <- getSize SizeOfV0 ("a" :: T.Text)
-- Bytes of string + tag overhead
assertEqual "size should be 5" 5 size
, testCase "FieldKey" $ do
Expand Down
6 changes: 2 additions & 4 deletions pact/Pact/Core/Errors.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ViewPatterns #-}
{-# LANGUAGE DeriveTraversable #-}
Expand Down Expand Up @@ -198,7 +197,6 @@ import Control.Lens hiding (ix)
import Control.Applicative
import Data.Proxy
import Data.Text(Text)
import Data.Typeable(Typeable)
import Data.Set(Set)
import Data.List(intersperse)
import Data.Default
Expand Down Expand Up @@ -975,7 +973,7 @@ data DbOpError
| NotInTx Text
| OpDisallowed
| MultipleRowsReturnedFromSingleWrite
deriving (Show, Eq, Typeable, Generic)
deriving (Show, Eq, Generic)

instance NFData DbOpError

Expand Down Expand Up @@ -1022,7 +1020,7 @@ data UserRecoverableError
| VerifierFailure VerifierName Text
-- ^ Verifier failure
| CapabilityGuardNotAcquired (CapabilityGuard QualifiedName PactValue)
deriving (Show, Eq, Generic, Typeable)
deriving (Show, Eq, Generic)

instance NFData UserRecoverableError

Expand Down
Loading