All names are printed with their unique values by default. (#5972)

* chore: explicit imports

* Test demonstrates that without printed unique value a name won't roundtrip printing/parsing

* Pretty-printing with indexes by default, simple representation by
opt-in.

* Updated golden files

Author: Unisay

cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests.hs

@@ -9,7 +9,7 @@ import Cardano.Constitution.Validator.TestsCommon
 import Helpers.TestBuilders
 import PlutusCore.Evaluation.Machine.ExBudget
 import PlutusCore.Evaluation.Machine.ExBudgetingDefaults
-import PlutusCore.Pretty (prettyPlcReadableDef)
+import PlutusCore.Pretty (prettyPlcReadable)
 import PlutusLedgerApi.V3 as V3
 import PlutusLedgerApi.V3.ArbitraryContexts as V3
 import PlutusTx.Code as Tx
@@ -56,13 +56,13 @@ test_budget_small = testGroup "BudgetSmall" $ M.elems $
 test_readable_pir = testGroup "ReadablePir" $ M.elems $
     (\vName (_, vCode) ->
          goldenVsString vName (mkPath vName ["pir"]) $
-            pure $ fromString $ show $ prettyPlcReadableDef $ fromJust $ getPirNoAnn vCode
+            pure $ fromString $ show $ prettyPlcReadable $ fromJust $ getPirNoAnn vCode
     )`M.mapWithKey` defaultValidatorsWithCodes
 
 test_readable_uplc = testGroup "ReadableUplc" $ M.elems $
     (\vName (_, vCode) ->
          goldenVsString vName (mkPath vName ["uplc"]) $
-            pure $ fromString $ show $ prettyPlcReadableDef $ getPlcNoAnn vCode
+            pure $ fromString $ show $ prettyPlcReadable $ getPlcNoAnn vCode
     )`M.mapWithKey` defaultValidatorsWithCodes
 
 tests :: TestTreeWithTestState

cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.pir.golden

@@ -82,7 +82,7 @@ writePlc p =
         traverseOf UPLC.progTerm UPLC.unDeBruijnTerm p
     of
       Left e   -> throw e
-      Right p' -> Haskell.print . PP.prettyPlcClassicDebug $ p'
+      Right p' -> Haskell.print . PP.prettyPlcClassicSimple $ p'
 
 
 main1 :: Haskell.IO ()

cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.uplc.golden

@@ -35,7 +35,7 @@ import PlutusCore.Default (DefaultFun, DefaultUni)
 import PlutusCore.Evaluation.Machine.ExBudget (ExBudget (..))
 import PlutusCore.Evaluation.Machine.ExBudgetingDefaults qualified as PLC
 import PlutusCore.Evaluation.Machine.ExMemory (ExCPU (..), ExMemory (..))
-import PlutusCore.Pretty (prettyPlcClassicDebug)
+import PlutusCore.Pretty (prettyPlcClassicSimple)
 import PlutusTx (getPlcNoAnn)
 import PlutusTx.Code (CompiledCode, sizePlc)
 import PlutusTx.Prelude hiding (fmap, mappend, traverse_, (<$), (<$>), (<*>), (<>))
@@ -311,7 +311,7 @@ main :: IO ()
 main = do
   execParser (info (helper <*> options) (fullDesc <> progDesc description <> footerDoc (Just footerInfo))) >>= \case
     RunPLC pa ->
-        print . prettyPlcClassicDebug . evaluateWithCek . getTerm $ pa
+        print . prettyPlcClassicSimple . evaluateWithCek . getTerm $ pa
     RunHaskell pa ->
         case pa of
           Clausify formula        -> print $ Clausify.runClausify formula
@@ -322,7 +322,7 @@ main = do
           Primetest n             -> if n<0 then Hs.error "Positive number expected"
                                      else print $ Prime.runPrimalityTest n
     DumpPLC pa ->
-        traverse_ putStrLn $ unindent . prettyPlcClassicDebug . UPLC.Program () PLC.latestVersion . getTerm $ pa
+        traverse_ putStrLn $ unindent . prettyPlcClassicSimple . UPLC.Program () PLC.latestVersion . getTerm $ pa
             where unindent d = map (dropWhile isSpace) $ (Hs.lines . Hs.show $ d)
     DumpFlatNamed pa ->
         writeFlatNamed . UPLC.Program () PLC.latestVersion . getTerm $ pa

cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.pir.golden

@@ -32,7 +32,7 @@ runTestGhc = runTestNested ["nofib", "test"] . pure . testNestedGhc
 -- Unit tests comparing PLC and Haskell computations on given inputs
 
 runAndCheck :: Tx.Lift DefaultUni a => Term -> a -> IO ()
-runAndCheck term value = cekResultMatchesHaskellValue term (@?=) value
+runAndCheck term = cekResultMatchesHaskellValue term (@?=)
 
 ---------------- Clausify ----------------
 

cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.uplc.golden

@@ -25,7 +25,7 @@ assertSucceeded t =
     case runTermCek t of
         (Right _, _)  -> pure ()
         (Left err, logs) -> assertFailure . Text.unpack . Text.intercalate "\n" $
-            [ render (prettyPlcClassicDebug err)
+            [ render (prettyPlcClassicSimple err)
             , "Cek logs:"
             ] ++ logs
 

plutus-benchmark/cek-calibration/Main.hs

@@ -0,0 +1,3 @@
+### Changed
+
+-  All names are printed with their unique suffixes by default.