Reinstate some pretty related things

Author: Lucsanszky

libs/cardano-ledger-conformance/src/Test/Cardano/Ledger/Conformance/ExecSpecRule/Conway/Utxo.hs

@@ -23,8 +23,7 @@ import qualified Data.Text as T
 import Lens.Micro ((&), (.~), (^.))
 import qualified MAlonzo.Code.Ledger.Foreign.API as Agda
 import Prettyprinter ((<+>))
-import qualified Prettyprinter as PP
-import Test.Cardano.Ledger.Common (Arbitrary (..), Gen, showExpr)
+import Test.Cardano.Ledger.Common (Arbitrary (..), Gen, ppString, showExpr, vcat)
 import Test.Cardano.Ledger.Conformance (
   ExecSpecRule (..),
   SpecTranslate (..),
@@ -50,7 +49,6 @@ import Test.Cardano.Ledger.Generic.GenState (
   runGenRS,
  )
 import qualified Test.Cardano.Ledger.Generic.GenState as GenSize
-import qualified Test.Cardano.Ledger.Generic.PrettyCore as PP
 import qualified Test.Cardano.Ledger.Generic.Proof as Proof
 import Test.Cardano.Ledger.Generic.TxGen (genAlonzoTx)
 
@@ -95,16 +93,16 @@ instance ExecSpecRule "UTXO" ConwayEra where
       Agda.utxoStep externalFunctions env st sig
 
   extraInfo _ ctx env@UtxoEnv {..} st@UTxOState {..} sig st' =
-    PP.vcat
+    vcat
       [ "Impl:"
-      , PP.ppString (showConwayTxBalance uePParams ueCertState utxosUtxo sig)
-      , "initial TotalAda:" <+> PP.ppString (showExpr $ totalAda st)
+      , ppString (showConwayTxBalance uePParams ueCertState utxosUtxo sig)
+      , "initial TotalAda:" <+> ppString (showExpr $ totalAda st)
       , "final TotalAda:  " <+> case st' of
-          Right (x, _) -> PP.ppString (showExpr $ totalAda x)
+          Right (x, _) -> ppString (showExpr $ totalAda x)
           Left _ -> "N/A"
       , mempty
       , "Spec:"
-      , PP.ppString
+      , ppString
           ( either show T.unpack . runSpecTransM ctx $
               Agda.utxoDebug externalFunctions
                 <$> toSpecRep env

libs/cardano-ledger-conformance/src/Test/Cardano/Ledger/Conformance/ExecSpecRule/Conway/Utxow.hs

@@ -21,7 +21,7 @@ import Data.Bifunctor (Bifunctor (..))
 import qualified Data.Text as T
 import Lens.Micro ((^.))
 import qualified MAlonzo.Code.Ledger.Foreign.API as Agda
-import qualified Prettyprinter as PP
+import Test.Cardano.Ledger.Common (ppString, showExpr, vcat)
 import Test.Cardano.Ledger.Conformance (
   ExecSpecRule (..),
   SpecTranslate,
@@ -42,9 +42,7 @@ import Test.Cardano.Ledger.Constrained.Conway (
   utxoStateSpec,
   utxoTxSpec,
  )
-import qualified Test.Cardano.Ledger.Generic.PrettyCore as PP
 import Test.Cardano.Ledger.Shelley.Utils (runSTS)
-import Test.Cardano.Ledger.TreeDiff (showExpr)
 
 instance
   SpecTranslate ConwayTxBodyTransContext (ConwayTxCert ConwayEra) =>
@@ -69,15 +67,15 @@ instance
       stFinal = first showOpaqueErrorString $ runSTS @"UTXO" @ConwayEra globals env st sig
       utxoInfo = extraInfo @"UTXO" @ConwayEra globals ctx env st sig stFinal
      in
-      PP.vcat
+      vcat
         [ "UTXOW"
         , "Impl:"
         , "witsVKeyNeeded"
-        , PP.ppString . showExpr $
+        , ppString . showExpr $
             getConwayWitsVKeyNeeded @ConwayEra (utxosUtxo st) (sig ^. bodyTxL)
         , "witsVKeyHashes"
         , "Spec:"
-        , PP.ppString result
+        , ppString result
         , mempty
         , "UTXO"
         , utxoInfo

libs/cardano-ledger-conformance/test/Test/Cardano/Ledger/Conformance/ExecSpecRule/MiniTrace.hs

@@ -39,7 +39,6 @@ import Test.Cardano.Ledger.Conformance.ExecSpecRule.Conway (
   namePoolCert,
   nameTxCert,
  )
-import Test.Cardano.Ledger.Generic.PrettyCore (PrettyA (..))
 import Test.Cardano.Ledger.Generic.Proof (Proof (..), WitRule (..), goSTS)
 import qualified Test.Cardano.Ledger.Generic.Proof as Proof
 
@@ -50,8 +49,8 @@ minitraceEither ::
   forall s e.
   ( ExecSpecRule s e
   , ExecState s e ~ State (EraRule s e)
-  , PrettyA (Signal (EraRule s e))
-  , PrettyA (State (EraRule s e))
+  , ToExpr (Signal (EraRule s e))
+  , ToExpr (State (EraRule s e))
   ) =>
   WitRule s e ->
   Int ->
@@ -77,8 +76,8 @@ minitraceEither witrule n0 = do
               Left ps ->
                 pure
                   ( Left
-                      ( [ "\nSIGNAL = " ++ show (prettyA signal2)
-                        , "\nSTATE = " ++ show (prettyA state)
+                      ( [ "\nSIGNAL = " ++ show (toExpr signal2)
+                        , "\nSTATE = " ++ show (toExpr state)
                         , "\nPredicateFailures"
                         ]
                           ++ map show (NE.toList ps)
@@ -96,8 +95,8 @@ minitrace ::
   forall s e.
   ( ExecSpecRule s e
   , ExecState s e ~ State (EraRule s e)
-  , PrettyA (Signal (EraRule s e))
-  , PrettyA (State (EraRule s e))
+  , ToExpr (Signal (EraRule s e))
+  , ToExpr (State (EraRule s e))
   ) =>
   WitRule s e ->
   Int ->
@@ -112,8 +111,8 @@ minitraceProp ::
   forall s e.
   ( ExecSpecRule s e
   , ExecState s e ~ State (EraRule s e)
-  , PrettyA (Signal (EraRule s e))
-  , PrettyA (State (EraRule s e))
+  , ToExpr (Signal (EraRule s e))
+  , ToExpr (State (EraRule s e))
   ) =>
   WitRule s e ->
   Int ->

libs/cardano-ledger-core/testlib/Test/Cardano/Ledger/Common.hs

@@ -41,11 +41,16 @@ module Test.Cardano.Ledger.Common (
 
   -- * Miscellanous helpers
   tracedDiscard,
+
+  -- * Prettyprinter related
+  ppString,
+  vcat,
 ) where
 
 import Control.DeepSeq (NFData)
 import Control.Monad as X (forM_, replicateM, replicateM_, unless, void, when, (>=>))
 import qualified Debug.Trace as Debug
+import Prettyprinter (Doc, pretty, vcat)
 import Test.Cardano.Ledger.Binary.TreeDiff (
   ToExpr (..),
   ansiExpr,
@@ -122,3 +127,6 @@ runGen ::
   Gen a ->
   a
 runGen seed size gen = unGen gen (mkQCGen seed) size
+
+ppString :: String -> Doc a
+ppString = pretty