wip

Author: Lucsanszky

libs/cardano-ledger-test/cardano-ledger-test.cabal

@@ -120,7 +120,6 @@ library
     QuickCheck,
     array,
     base >=4.14 && <5,
-    bech32,
     bytestring,
     cardano-crypto,
     cardano-crypto-class,

libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Ast.hs

@@ -26,6 +26,7 @@ import qualified Data.Map.Strict as Map
 import Data.Set (Set)
 import qualified Data.Set as Set
 import Data.Text (Text, pack)
+import Data.TreeDiff
 import qualified Data.Universe as Univ (Any (..))
 import Data.Void (Void)
 import Data.Word (Word64)
@@ -257,7 +258,7 @@ data RootTarget era root t where
   Mask :: RootTarget era r a -> RootTarget era Void a
   Virtual ::
     Term era t ->
-    PDoc ->
+    Expr ->
     Lens' root t ->
     -- | Just like Lensed but uses the String to name the field (instead of the Term)
     RootTarget era root t
@@ -408,10 +409,10 @@ args other = [Univ.Any other]
 -- | Print a Target as a record showing the struture and names of all
 --   the variables involved. This documents what is in scope where
 --   the Target value was defined.
-ppTarget :: RootTarget era r t -> PDoc
+ppTarget :: RootTarget era r t -> Expr
 ppTarget x = targetRecord x []
 
-targetRecord :: RootTarget era r t -> [(Text, PDoc)] -> PDoc
+targetRecord :: RootTarget era r t -> [(Text, Expr)] -> Expr
 targetRecord (Constr n _) xs = ppRecord (pack n) xs
 targetRecord (ts :$ t) xs = targetRecord ts (targetPair t : xs)
 targetRecord (Simple e) [] = ppString (show e)
@@ -437,7 +438,7 @@ nameOf (Shift x _) = nameOf x
 nameOf (Mask x) = nameOf x
 nameOf (Virtual _ x _) = pack (show x)
 
-targetPair :: RootTarget era r t -> (Text, PDoc)
+targetPair :: RootTarget era r t -> (Text, Expr)
 targetPair (Simple (Var (V n rep _))) = (pack n, ppString (show rep))
 targetPair (Lensed (Var (V n rep _)) _) = (pack n, ppString (show rep))
 targetPair (Partial (Var (V n rep _)) _) = (pack n, ppString (show rep))

libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Classes.hs

@@ -1,12 +1,14 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
@@ -31,13 +33,16 @@ import Cardano.Ledger.State (EraCertState (..), IndividualPoolStake (..), Script
 import Cardano.Ledger.TxIn (TxIn)
 import Cardano.Ledger.Val (Val (coin, modifyCoin, (<+>)))
 import Data.Default (Default (def))
+import Data.Functor.Identity (Identity)
 import qualified Data.List as List
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import Data.Set (Set)
 import qualified Data.Set as Set
+import Data.TreeDiff (ToExpr (toExpr))
 import Data.Typeable
 import Data.Word (Word64)
+import GHC.Generics (Generic)
 import GHC.Real (denominator, numerator, (%))
 import Lens.Micro
 import Numeric.Natural (Natural)
@@ -483,8 +488,8 @@ hashTxAuxDataF (TxAuxDataF _ x) = hashTxAuxData x
 unTxAuxData :: TxAuxDataF era -> TxAuxData era
 unTxAuxData (TxAuxDataF _ x) = x
 
-instance Show (TxAuxDataF era) where
-  show (TxAuxDataF p x) = show ((unReflect pcAuxData p x) :: PDoc)
+instance ToExpr (TxAuxData era) => Show (TxAuxDataF era) where
+  show (TxAuxDataF _p x) = show $ toExpr x
 
 instance Eq (TxAuxDataF era) where
   (TxAuxDataF Shelley x) == (TxAuxDataF Shelley y) = x == y
@@ -494,9 +499,6 @@ instance Eq (TxAuxDataF era) where
   (TxAuxDataF Babbage x) == (TxAuxDataF Babbage y) = x == y
   (TxAuxDataF Conway x) == (TxAuxDataF Conway y) = x == y
 
-pcAuxData :: Proof era -> TxAuxData era -> PDoc
-pcAuxData p _x = ppString ("TxAuxData " ++ show p) -- TODO make this more accurate
-
 genTxAuxDataF :: Proof era -> Gen (TxAuxDataF era)
 genTxAuxDataF p@Shelley = TxAuxDataF p <$> suchThat arbitrary (validateTxAuxData (protocolVersion p))
 genTxAuxDataF p@Allegra = TxAuxDataF p <$> suchThat arbitrary (validateTxAuxData (protocolVersion p))
@@ -513,11 +515,12 @@ data TxF era where
 unTxF :: TxF era -> Tx era
 unTxF (TxF _ x) = x
 
-instance PrettyA (TxF era) where
-  prettyA (TxF p tx) = pcTx p tx
+-- TODO: this feels iffy
+deriving instance Generic (TxF era)
+instance (ToExpr (Proof era), ToExpr (Tx era)) => ToExpr (TxF era)
 
-instance PrettyA (PParamsUpdate era) => Show (TxF era) where
-  show (TxF p x) = show ((unReflect pcTx p x) :: PDoc)
+instance (ToExpr (PParamsUpdate era), ToExpr (Tx era)) => Show (TxF era) where
+  show (TxF _p x) = show $ toExpr x
 
 instance Eq (TxF era) where
   (TxF Shelley x) == (TxF Shelley y) = x == y
@@ -535,8 +538,8 @@ data TxWitsF era where
 unTxWitsF :: TxWitsF era -> TxWits era
 unTxWitsF (TxWitsF _ x) = x
 
-instance Show (TxWitsF era) where
-  show (TxWitsF p x) = show ((unReflect pcWitnesses p x) :: PDoc)
+instance ToExpr (TxWits era) => Show (TxWitsF era) where
+  show (TxWitsF _p x) = show $ toExpr x
 
 instance Eq (TxWitsF era) where
   (TxWitsF Shelley x) == (TxWitsF Shelley y) = x == y
@@ -554,11 +557,12 @@ data TxBodyF era where
 unTxBodyF :: TxBodyF era -> TxBody era
 unTxBodyF (TxBodyF _ x) = x
 
-instance PrettyA (PParamsUpdate era) => Show (TxBodyF era) where
-  show (TxBodyF p x) = show ((unReflect pcTxBody p x) :: PDoc)
+deriving instance Generic (TxBodyF era)
+
+instance (ToExpr (TxBody era), ToExpr (PParamsUpdate era)) => Show (TxBodyF era) where
+  show (TxBodyF _p x) = show $ toExpr x
 
-instance PrettyA (TxBodyF era) where
-  prettyA (TxBodyF p x) = unReflect pcTxBody p x
+instance (ToExpr (TxBody era), ToExpr (Proof era)) => ToExpr (TxBodyF era)
 
 instance Eq (TxBodyF era) where
   (TxBodyF Shelley x) == (TxBodyF Shelley y) = x == y
@@ -575,11 +579,11 @@ data TxCertF era where
 unTxCertF :: TxCertF era -> TxCert era
 unTxCertF (TxCertF _ x) = x
 
-instance PrettyA (TxCertF era) where
-  prettyA (TxCertF p x) = pcTxCert p x
+deriving instance Generic (TxCertF era)
+instance (ToExpr (Proof era), ToExpr (TxCert era)) => ToExpr (TxCertF era)
 
-instance Show (TxCertF era) where
-  show (TxCertF p x) = show (pcTxCert p x)
+instance ToExpr (TxCert era) => Show (TxCertF era) where
+  show (TxCertF _p x) = show $ toExpr x
 
 instance Eq (TxCertF era) where
   (TxCertF Shelley x) == (TxCertF Shelley y) = x == y
@@ -602,11 +606,11 @@ data PlutusPointerF era where
 unPlutusPointerF :: PlutusPointerF era -> PlutusPurpose AsIx era
 unPlutusPointerF (PlutusPointerF _ pp) = pp
 
-instance Show (PlutusPurposeF era) where
-  show (PlutusPurposeF p x) = unReflect (\_ -> show (ppPlutusPurposeAsIxItem x)) p
+instance ToExpr (PlutusPurpose AsIxItem era) => Show (PlutusPurposeF era) where
+  show (PlutusPurposeF _p x) = show $ toExpr x
 
-instance Show (PlutusPointerF era) where
-  show (PlutusPointerF p x) = unReflect (\_ -> show (ppPlutusPurposeAsIx x)) p
+instance ToExpr (PlutusPurpose AsIx era) => Show (PlutusPointerF era) where
+  show (PlutusPointerF _p x) = show $ toExpr x
 
 instance Eq (PlutusPurposeF era) where
   PlutusPurposeF Alonzo x == PlutusPurposeF Alonzo y = x == y
@@ -633,8 +637,8 @@ data TxOutF era where
 unTxOut :: TxOutF era -> TxOut era
 unTxOut (TxOutF _ x) = x
 
-instance PrettyA (TxOutF era) where
-  prettyA (TxOutF p x) = unReflect pcTxOut p x
+deriving instance Generic (TxOutF era)
+instance (ToExpr (Proof era), ToExpr (TxOut era)) => ToExpr (TxOutF era)
 
 instance Eq (TxOutF era) where
   x1 == x2 = compare x1 x2 == EQ
@@ -657,8 +661,8 @@ instance Ord (TxOutF era) where
 data ValueF era where
   ValueF :: Proof era -> Value era -> ValueF era
 
-instance PrettyA (ValueF era) where
-  prettyA (ValueF p v) = pcVal p v
+deriving instance Generic (ValueF era)
+instance (ToExpr (Proof era), ToExpr (Value era)) => ToExpr (ValueF era)
 
 unValue :: ValueF era -> Value era
 unValue (ValueF _ v) = v
@@ -687,8 +691,8 @@ data PParamsF era where
 unPParams :: PParamsF era -> PParams era
 unPParams (PParamsF _ p) = p
 
-instance PrettyA (PParamsF era) where
-  prettyA (PParamsF p x) = unReflect pcPParams p x
+deriving instance Generic (PParamsF era)
+instance (ToExpr (PParamsHKD Identity era), ToExpr (Proof era)) => ToExpr (PParamsF era)
 
 instance Eq (PParamsF era) where
   PParamsF p1 x == PParamsF _ y =
@@ -722,8 +726,8 @@ data ProposedPPUpdatesF era where
 unProposedPPUpdates :: ProposedPPUpdatesF era -> PP.ProposedPPUpdates era
 unProposedPPUpdates (ProposedPPUpdatesF _ x) = x
 
-instance PrettyA (PParamsUpdate e) => PrettyA (ProposedPPUpdatesF e) where
-  prettyA (ProposedPPUpdatesF _p x) = ppProposedPPUpdates x
+deriving instance Generic (ProposedPPUpdatesF era)
+instance (ToExpr (PParamsUpdate e), ToExpr (Proof e)) => ToExpr (ProposedPPUpdatesF e)
 
 proposedCoreL ::
   Lens' (PP.ProposedPPUpdates era) (Map (KeyHash 'Genesis) (PParamsUpdate era))
@@ -754,8 +758,8 @@ data CertStateF era where
 unCertStateF :: CertStateF era -> CertState era
 unCertStateF (CertStateF _ x) = x
 
-instance Reflect era => PrettyA (CertStateF era) where
-  prettyA (CertStateF _ x) = pcCertState x
+deriving instance Generic (CertStateF era)
+instance (ToExpr (Proof era), ToExpr (CertState era)) => ToExpr (CertStateF era)
 
 instance Eq (CertStateF era) where
   (CertStateF Shelley x) == (CertStateF Shelley y) = x == y
@@ -798,11 +802,11 @@ putPPUP Conway _ = Gov.emptyGovState @era
 liftUTxO :: Map TxIn (TxOutF era) -> UTxO era
 liftUTxO m = UTxO (Map.map unTxOut m)
 
-instance Show (TxOutF era) where
-  show (TxOutF p t) = show (unReflect pcTxOut p t :: PDoc)
+instance ToExpr (TxOut era) => Show (TxOutF era) where
+  show (TxOutF _p t) = show $ toExpr t
 
-instance Show (ValueF era) where
-  show (ValueF p t) = show (pcVal p t)
+instance ToExpr (Value era) => Show (ValueF era) where
+  show (ValueF _p t) = show $ toExpr t
 
 instance Show (PParamsF era) where
   show (PParamsF _ _) = "PParamsF ..."
@@ -898,8 +902,8 @@ data ScriptsNeededF era where
 unScriptsNeededF :: ScriptsNeededF era -> ScriptsNeeded era
 unScriptsNeededF (ScriptsNeededF _ v) = v
 
-instance Show (ScriptsNeededF era) where
-  show (ScriptsNeededF p t) = unReflect (\_ -> show (pcScriptsNeeded p t)) p
+instance ToExpr (ScriptsNeeded era) => Show (ScriptsNeededF era) where
+  show (ScriptsNeededF _p t) = show $ toExpr t
 
 -- ========================
 
@@ -909,11 +913,11 @@ data ScriptF era where
 unScriptF :: ScriptF era -> Script era
 unScriptF (ScriptF _ v) = v
 
-instance PrettyA (ScriptF era) where
-  prettyA (ScriptF p x) = unReflect pcScript p x
+deriving instance Generic (ScriptF era)
+instance (ToExpr (Proof era), ToExpr (Script era)) => ToExpr (ScriptF era)
 
-instance Show (ScriptF era) where
-  show (ScriptF p t) = show ((unReflect pcScript p t) :: PDoc)
+instance ToExpr (Script era) => Show (ScriptF era) where
+  show (ScriptF _p t) = show $ toExpr t
 
 instance Eq (ScriptF era) where
   (ScriptF Shelley x) == (ScriptF Shelley y) = x == y