wip - Remove ToExprs

Author: Lucsanszky

eras/allegra/impl/testlib/Test/Cardano/Ledger/Allegra/Era.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableSuperClasses #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
@@ -19,6 +20,7 @@ class
   , AllegraEraTxBody era
   , AllegraEraTxAuxData era
   , AllegraEraScript era
+  , NativeScript era ~ Timelock era
   ) =>
   AllegraEraTest era
 

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/UTxO.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
@@ -64,13 +65,14 @@ import qualified Data.Map.Strict as Map
 import Data.Maybe (catMaybes, fromMaybe, isJust)
 import qualified Data.Set as Set
 import Data.Word (Word32)
+import GHC.Generics
 import Lens.Micro ((^.))
 import Lens.Micro.Extras (view)
 
 -- | Alonzo era style `ScriptsNeeded` require also a `PlutusPurpose`, not only the `ScriptHash`
 newtype AlonzoScriptsNeeded era
   = AlonzoScriptsNeeded [(PlutusPurpose AsIxItem era, ScriptHash)]
-  deriving (Monoid, Semigroup)
+  deriving (Monoid, Semigroup, Generic)
 
 deriving instance AlonzoEraScript era => Eq (AlonzoScriptsNeeded era)
 deriving instance AlonzoEraScript era => Show (AlonzoScriptsNeeded era)

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/Era.hs

@@ -26,6 +26,8 @@ class
   , AlonzoEraTxAuxData era
   , AlonzoEraUTxO era
   , ToExpr (PlutusScript era)
+  , ToExpr (PlutusPurpose AsIx era)
+  , ToExpr (PlutusPurpose AsIxItem era)
   , Script era ~ AlonzoScript era
   ) =>
   AlonzoEraTest era

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/TreeDiff.hs

@@ -25,6 +25,7 @@ import Cardano.Ledger.Alonzo.Tx
 import Cardano.Ledger.Alonzo.TxAuxData
 import Cardano.Ledger.Alonzo.TxBody
 import Cardano.Ledger.Alonzo.TxWits
+import Cardano.Ledger.Alonzo.UTxO
 import Cardano.Ledger.BaseTypes
 import Cardano.Ledger.Compactible
 import Cardano.Ledger.Plutus.Evaluate (PlutusWithContext (..))
@@ -45,6 +46,12 @@ deriving newtype instance ToExpr ix => ToExpr (AsIx ix it)
 
 deriving newtype instance ToExpr it => ToExpr (AsItem ix it)
 
+instance (ToExpr ix, ToExpr it) => ToExpr (AsIxItem ix it)
+
+instance ToExpr (PlutusPurpose AsIxItem era) => ToExpr (AlonzoScriptsNeeded era)
+
+instance ToExpr (TxCert era) => ToExpr (AlonzoPlutusPurpose AsIxItem era)
+
 -- Core
 deriving newtype instance ToExpr CoinPerWord
 

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Era.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE UndecidableSuperClasses #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/TreeDiff.hs

@@ -46,6 +46,12 @@ instance
   ) =>
   ToExpr (ConwayPlutusPurpose AsItem era)
 
+instance
+  ( ToExpr (TxCert era)
+  , ToExpr (PParamsHKD StrictMaybe era)
+  ) =>
+  ToExpr (ConwayPlutusPurpose AsIxItem era)
+
 -- PlutusContext
 instance
   ( Era era
@@ -127,6 +133,18 @@ instance
     where
       (a, b) = finishDRepPulser x
 
+-- TODO: consider this
+instance
+  ( EraStake era
+  , EraPParams era
+  , ToExpr (DRepPulsingState era)
+  , ToExpr (RatifyState era)
+  , ToExpr (PParamsHKD StrictMaybe era)
+  ) =>
+  ToExpr (DRepPulser era Identity (RatifyState era))
+  where
+  toExpr = toExpr . finishDRepPulser . DRPulsing
+
 instance ToExpr (InstantStake era) => ToExpr (RatifyEnv era) where
   toExpr (RatifyEnv stake pool drep dstate ep cs delegatees poolps) =
     App

eras/shelley/impl/src/Cardano/Ledger/Shelley/UTxO.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE BlockArguments #-}
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
@@ -80,6 +81,7 @@ import Data.Foldable (Foldable (fold), foldr', toList)
 import qualified Data.Map.Strict as Map
 import Data.Set (Set)
 import qualified Data.Set as Set
+import GHC.Generics (Generic)
 import Lens.Micro ((^.))
 
 -- | Compute the subset of inputs of the set 'txIns' for which each input is
@@ -173,7 +175,7 @@ getConsumedCoin pp lookupRefund utxo txBody =
     withdrawals = fold . unWithdrawals $ txBody ^. withdrawalsTxBodyL
 
 newtype ShelleyScriptsNeeded era = ShelleyScriptsNeeded (Set ScriptHash)
-  deriving (Eq, Show)
+  deriving (Eq, Show, Generic)
 
 instance EraUTxO ShelleyEra where
   type ScriptsNeeded ShelleyEra = ShelleyScriptsNeeded ShelleyEra

eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/Era.hs

@@ -10,6 +10,7 @@ module Test.Cardano.Ledger.Shelley.Era (
 import Cardano.Ledger.Shelley
 import Cardano.Ledger.Shelley.LedgerState
 import Cardano.Ledger.Shelley.Scripts
+import Cardano.Ledger.State
 import Data.Default
 import Test.Cardano.Ledger.Common
 import Test.Cardano.Ledger.Era
@@ -25,6 +26,7 @@ class
   , NFData (StashedAVVMAddresses era)
   , Default (StashedAVVMAddresses era)
   , Arbitrary (StashedAVVMAddresses era)
+  , ToExpr (ScriptsNeeded era)
   ) =>
   ShelleyEraTest era
 

eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/TreeDiff.hs

@@ -26,6 +26,7 @@ import Cardano.Ledger.Shelley.TxBody
 import Cardano.Ledger.Shelley.TxCert
 import Cardano.Ledger.Shelley.TxOut
 import Cardano.Ledger.Shelley.TxWits
+import Cardano.Ledger.Shelley.UTxO
 import Test.Cardano.Ledger.TreeDiff
 
 -- PParams
@@ -154,6 +155,8 @@ instance
 
 instance ToExpr (ShelleyInstantStake era)
 
+instance ToExpr (ShelleyScriptsNeeded era)
+
 -- Rules/Utxo
 instance
   ( ToExpr (EraRuleFailure "PPUP" era)