Remove orphan instances from pact-5

kadena-io · Jul 19, 2024 · 18b9b72 · 18b9b72
1 parent 80b76c1
commit 18b9b72
Show file tree

Hide file tree

Showing 5 changed files with 593 additions and 470 deletions.
diff --git a/pact-tests/Pact/Core/Test/SerialiseTests.hs b/pact-tests/Pact/Core/Test/SerialiseTests.hs
@@ -5,7 +5,7 @@ module Pact.Core.Test.SerialiseTests where
 
 import Pact.Core.Serialise
 import Pact.Core.Gen
-import Pact.Core.Serialise.CBOR_V1 ()
+import Pact.Core.Serialise.CBOR_V1
 import qualified Codec.Serialise as S
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.Hedgehog
@@ -72,10 +72,10 @@ tests = testGroup "Serialise Roundtrip"
 
 -- | For any CBOR-Serialisable and `Gen` type, assert that serialization
 --   roundtrips.
-serialiseRoundtrip :: forall a. (S.Serialise a, Show a, Eq a) => Gen a -> Property
+serialiseRoundtrip :: forall a. (S.Serialise (SerialiseV1 a), Show a, Eq a) => Gen a -> Property
 serialiseRoundtrip g = property $ do
   expr <- forAll g
-  S.deserialise (S.serialise expr) === expr
+  _getSV1 (S.deserialise (S.serialise (SerialiseV1 expr))) === expr
 
 documentVersionGen :: Gen DocumentVersion
 documentVersionGen = Gen.element [minBound .. maxBound]

diff --git a/pact/Pact/Core/Guards.hs b/pact/Pact/Core/Guards.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE DerivingStrategies #-}
 
 
 module Pact.Core.Guards
@@ -44,6 +45,7 @@ import Data.Maybe (isJust)
 import Data.Text(Text)
 import GHC.Generics
 import Text.Parser.Token as P
+import Codec.Serialise.Class (Serialise)
 
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
@@ -60,7 +62,8 @@ import qualified Pact.Crypto.WebAuthn.Cose.PublicKeyWithSignAlg as WA
 import qualified Pact.Crypto.WebAuthn.Cose.SignAlg as WA
 
 newtype PublicKeyText = PublicKeyText { _pubKey :: Text }
-  deriving (Eq,Ord,Show, NFData)
+  deriving (Eq,Ord,Show)
+  deriving newtype (NFData, Serialise)
 
 instance Pretty PublicKeyText where
   pretty (PublicKeyText t) = pretty t

diff --git a/pact/Pact/Core/Names.hs b/pact/Pact/Core/Names.hs
@@ -75,6 +75,7 @@ import Data.Word(Word64)
 import Control.Applicative((<|>))
 import Control.DeepSeq
 import GHC.Generics
+import Codec.Serialise.Class(Serialise)
 import qualified Data.Char as Char
 import qualified Text.Megaparsec as MP
 import qualified Text.Megaparsec.Char as MP
@@ -194,7 +195,7 @@ instance Pretty ParsedName where
 -- So in Field "a" in {"a":v},
 newtype Field = Field { _field :: Text }
   deriving (Eq, Ord, Show, Generic, FromJSONKey)
-  deriving newtype (IsString, NFData)
+  deriving newtype (IsString, NFData, Serialise)
 
 instance Pretty Field where
   pretty (Field f) = pretty f