Merge pull request #3730 from Quviq/PR-typerep-show

Implement `Show` instance for `Rep` using `IsTypeable`

Author: lehins

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

@@ -160,21 +160,21 @@ infix 4 :⊆:
 pattern (:⊆:) :: forall era. (forall a. Ord a => Term era (Set a) -> Term era (Set a) -> Pred era)
 pattern x :⊆: y = Subset x y
 
-pattern ExactSize :: Int -> Term era Size
+pattern ExactSize :: Era era => Int -> Term era Size
 pattern ExactSize x <- (sameRng -> Just x)
   where
     ExactSize x = Lit SizeR (SzRng x x)
 
-pattern AtLeast :: Int -> Term era Size
+pattern AtLeast :: Era era => Int -> Term era Size
 pattern AtLeast n = Lit SizeR (SzLeast n)
 
-pattern Size :: Size -> Term era Size
+pattern Size :: Era era => Size -> Term era Size
 pattern Size n = Lit SizeR n
 
-pattern AtMost :: Int -> Term era Size
+pattern AtMost :: Era era => Int -> Term era Size
 pattern AtMost n = Lit SizeR (SzMost n)
 
-pattern Range :: Int -> Int -> Term era Size
+pattern Range :: Era era => Int -> Int -> Term era Size
 pattern Range i j <- Lit SizeR (SzRng i j)
   where
     Range i j =
@@ -195,7 +195,7 @@ sameRng :: Term era Size -> Maybe Int
 sameRng (Lit SizeR (SzRng x y)) = if x == y then Just x else Nothing
 sameRng _ = Nothing
 
-pattern Word64 :: Word64 -> Term era Word64
+pattern Word64 :: Era era => Word64 -> Term era Word64
 pattern Word64 x = Lit Word64R x
 
 var :: Era era => String -> Rep era t -> Term era t
@@ -1009,7 +1009,7 @@ runComp _ t (AnyF (FConst r v _ l)) = do
   With _ <- hasEq r r
   pure $ t ^. l == v
 
-termRep :: Term era t -> Rep era t
+termRep :: Era era => Term era t -> Rep era t
 termRep (Lit r _) = r
 termRep (Var (V _ r _)) = r
 termRep (Dom (termRep -> MapR r _)) = SetR r
@@ -1041,7 +1041,7 @@ makeTest env c = do
   b <- runPred env c
   pure (show c ++ " => " ++ show b, b, c)
 
-displayTerm :: Env era -> Term era a -> IO ()
+displayTerm :: Era era => Env era -> Term era a -> IO ()
 displayTerm env (Var v@(V nm rep _)) = do
   x <- monadTyped (findVar v env)
   putStrLn (nm ++ "\n" ++ format rep x)

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

@@ -727,7 +727,7 @@ test19 = do
 
 -- ===================================================
 
-preds20 :: Proof era -> [Pred era]
+preds20 :: Era era => Proof era -> [Pred era]
 preds20 proof =
   [ Sized (ExactSize 10) intUniv
   , Sized (AtMost 6) rewardsx

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

@@ -480,5 +480,5 @@ maybeSL = lens foo bar
 poolMetaL :: Lens' (PoolParams era) (StrictMaybe PoolMetadata)
 poolMetaL = lens ppMetadata (\x r -> x {ppMetadata = r})
 
-poolMetadata :: Proof era -> Term era (Maybe PoolMetadata)
+poolMetadata :: Era era => Proof era -> Term era (Maybe PoolMetadata)
 poolMetadata p = Var (pV p "poolMetadata" (MaybeR (PoolMetadataR p)) (Yes PoolParamsR (poolMetaL . sMaybeL)))

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

@@ -7,7 +7,6 @@ module Test.Cardano.Ledger.Constrained.Shrink (
 import Control.Monad
 import Data.Maybe
 
-import Cardano.Ledger.Core (Era (..))
 import Test.Cardano.Ledger.Constrained.Ast
 import Test.Cardano.Ledger.Constrained.Env
 import Test.Cardano.Ledger.Constrained.Monad
@@ -29,7 +28,7 @@ justOneName xs = foldr accum [] xs -- FIXME throw away new style DependGraph ele
 --   Note that the DependGraph tells us the dependency order of the variables: a variable only
 --   depends on the variables before it in the graph, so when shrinking the value of a variable we
 --   only need to adjust the values of later variables.
-shrinkEnv :: Era era => DependGraph era -> Env era -> [Env era]
+shrinkEnv :: DependGraph era -> Env era -> [Env era]
 shrinkEnv (DependGraph vs) env =
   [ env'
   | (before, (x, cs), after) <- splits (justOneName vs)
@@ -40,7 +39,7 @@ shrinkEnv (DependGraph vs) env =
     splits [] = []
     splits (x : xs) = ([], x, xs) : [(x : ys, y, zs) | (ys, y, zs) <- splits xs]
 
-shrinkOneVar :: Era era => Env era -> [Name era] -> Name era -> [Pred era] -> [(Name era, [Pred era])] -> [Env era]
+shrinkOneVar :: Env era -> [Name era] -> Name era -> [Pred era] -> [(Name era, [Pred era])] -> [Env era]
 shrinkOneVar originalEnv before x cs after =
   [ env'
   | val' <- shrinkVar x cs' val
@@ -56,15 +55,15 @@ shrinkOneVar originalEnv before x cs after =
     cs' = map (substPred beforeSubst) cs
     val = fromJust $ findName x originalEnv
 
-shrinkVar :: Era era => Name era -> [Pred era] -> Payload era -> [Payload era]
+shrinkVar :: Name era -> [Pred era] -> Payload era -> [Payload era]
 shrinkVar v cs p = [p' | p' <- shrinkPayload p, validAssignment v p' cs]
 
-shrinkPayload :: Era era => Payload era -> [Payload era]
+shrinkPayload :: Payload era -> [Payload era]
 shrinkPayload (Payload rep t acc) = [Payload rep t' acc | t' <- shrinkRep rep t]
 
 -- | Compute something satisfying the constraints that's as "close" to the original value as
 --   possible. TODO: more cleverness
-fixupVar :: Era era => Name era -> [Pred era] -> Payload era -> Maybe (Payload era)
+fixupVar :: Name era -> [Pred era] -> Payload era -> Maybe (Payload era)
 fixupVar v cs p = listToMaybe [p' | p' <- [p | validAssignment v p cs] ++ reverse (shrinkVar v cs p)]
 
 -- | Assumes the variable is the only free variable in the constraints.

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

@@ -130,7 +130,7 @@ isCountType rep = case hasCount rep rep of
 -- ==================================================
 -- Extras, simple helper functions
 
-sameRep :: Era era => Rep era i -> Rep era j -> Typed (i :~: j)
+sameRep :: Rep era i -> Rep era j -> Typed (i :~: j)
 sameRep r1 r2 = case testEql r1 r2 of
   Just x -> pure x
   Nothing -> failT ["Type error in sameRep:\n  " ++ show r1 ++ " =/=\n  " ++ show r2]
@@ -167,7 +167,7 @@ exactlyOne pp xs = 1 == length (filter pp xs)
 --   This has been superceeded by the RelLens  RelSpec
 projOnDom ::
   forall era a dom rng.
-  (Era era, Ord dom) =>
+  Ord dom =>
   Set a ->
   Lens' dom a ->
   Rep era dom ->
@@ -180,7 +180,7 @@ projOnDom setA lensDomA repDom repRng = do
   where
     genThenOverwriteA a = Lens.set lensDomA a <$> genRep repDom
 
-atLeast :: (Era era, Adds c) => Rep era c -> c -> Gen c
+atLeast :: Adds c => Rep era c -> c -> Gen c
 atLeast rep c = add c <$> genRep rep
 
 -- ================================================================
@@ -623,7 +623,7 @@ summandsAsInt (x : xs) = do
   m <- summandsAsInt xs
   pure (m + n)
 
-sameV :: Era era => V era s -> V era t -> Typed (s :~: t)
+sameV :: V era s -> V era t -> Typed (s :~: t)
 sameV (V _ r1 _) (V _ r2 _) = sameRep r1 r2
 
 unique2 :: Adds c => V era t -> (Int, Bool, [Name era]) -> Sum era c -> Typed (Int, Bool, [Name era])
@@ -689,7 +689,7 @@ solveLists v@(V nm (ListR _) _) cs =
 -- Helper functions for use in 'dispatch'
 
 -- | Combine solving an generating for a variable with a 'Counts' instance
-genCount :: (Count t, Era era) => V era t -> [Pred era] -> Typed (Gen t)
+genCount :: Count t => V era t -> [Pred era] -> Typed (Gen t)
 genCount v1@(V _ rep _) [Random (Var v2)] | Name v1 == Name v2 = pure (genRep rep)
 genCount v1@(V _ r1 _) [Var v2@(V _ r2 _) :=: expr] | Name v1 == Name v2 = do
   Refl <- sameRep r1 r2
@@ -731,7 +731,7 @@ update :: t -> [Update t] -> t
 update t [] = t
 update t (Update s l : more) = update (Lens.set l s t) more
 
-anyToUpdate :: Era era => Rep era t1 -> (AnyF era t2) -> Typed (Update t1)
+anyToUpdate :: Rep era t1 -> (AnyF era t2) -> Typed (Update t1)
 anyToUpdate rep1 (AnyF (FConst _ s rep2 l)) = do
   Refl <- sameRep rep1 rep2
   pure (Update s l)

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

@@ -1546,7 +1546,7 @@ runElemSpec xs spec = case spec of
 
 genElemSpec ::
   forall w era.
-  (Adds w, Era era) =>
+  Adds w =>
   Rep era w ->
   -- Rep era c ->
   SomeLens era w ->
@@ -1583,7 +1583,6 @@ genElemSpec repw (SomeLens (l :: Lens' w c)) siz = do
 
 genFromElemSpec ::
   forall era r.
-  Era era =>
   [String] ->
   Gen r ->
   Int ->
@@ -1710,7 +1709,7 @@ runListSpec xs spec = case spec of
 
 genListSpec ::
   forall w era.
-  (Adds w, Era era) =>
+  Adds w =>
   Rep era w ->
   -- Rep era c ->
   SomeLens era w ->
@@ -1722,7 +1721,6 @@ genListSpec repw l size = do
 
 genFromListSpec ::
   forall era r.
-  Era era =>
   [String] ->
   Gen r ->
   ListSpec era r ->
@@ -1838,7 +1836,7 @@ someSet g = do
   n <- pos @Int
   Set.fromList <$> vectorOf n g
 
-someMap :: forall era t d. (Ord d, TestAdd t, Era era) => Rep era d -> Gen (Map d t)
+someMap :: forall era t d. (Ord d, TestAdd t) => Rep era d -> Gen (Map d t)
 someMap r = do
   n <- pos @Int
   rs <- vectorOf n anyAdds
@@ -1857,7 +1855,7 @@ testm = do
   b <- aMap
   monadTyped (liftT (a <> b))
 
-aList :: Era era => Gen (ListSpec era Word64)
+aList :: Gen (ListSpec era Word64)
 aList = genSize >>= genListSpec Word64R (SomeLens word64CoinL)
 
 testl :: Gen (ListSpec TT Word64)
@@ -2174,7 +2172,7 @@ runPairSpec m1 (PairSpec _ _ VarOnRight m2) = Map.isSubmapOf m2 m1
 -- and insist that when solving 'var' it contains the pairs from 'm2' and possibly more pairs
 runPairSpec m1 (PairSpec _ _ VarOnLeft m2) = Map.isSubmapOf m1 m2
 
-genPairSpec :: (Era era, Ord dom, Eq rng) => Rep era dom -> Rep era rng -> Gen (PairSpec era dom rng)
+genPairSpec :: forall era dom rng. (Ord dom, Eq rng) => Rep era dom -> Rep era rng -> Gen (PairSpec era dom rng)
 genPairSpec domr rngr =
   frequency
     [ (1, pure PairAny)
@@ -2202,7 +2200,7 @@ fixSide _ PairAny = PairAny
 fixSide side (PairSpec d r _ m) = PairSpec d r side m
 
 genConsistentPairSpec ::
-  (Ord dom, Era era, Eq rng) =>
+  (Ord dom, Eq rng) =>
   Rep era dom ->
   Rep era rng ->
   PairSpec era dom rng ->
@@ -2236,7 +2234,7 @@ genConsistentPairSpec _ _ (PairSpec d r VarOnLeft m) =
       )
     ]
 
-genFromPairSpec :: (Era era, Ord dom) => [String] -> PairSpec era dom rng -> Gen (Map dom rng)
+genFromPairSpec :: forall era dom rng. Ord dom => [String] -> PairSpec era dom rng -> Gen (Map dom rng)
 genFromPairSpec msgs (PairNever xs) = errorMess "genFromPairSpec failed due to PairNever" (msgs ++ xs)
 genFromPairSpec _msgs PairAny = pure $ Map.empty
 genFromPairSpec msgs p@(PairSpec domr rngr VarOnRight mp) = do

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

@@ -16,7 +16,7 @@ import Test.Cardano.Ledger.Generic.Proof hiding (lift)
 -- Some experiments with updating the state (Stored in the Env)
 -- Used as a means to track what applySTS does.
 
-inputsAction :: Proof era -> Set (TxIn (EraCrypto era)) -> TraceM era ()
+inputsAction :: Era era => Proof era -> Set (TxIn (EraCrypto era)) -> TraceM era ()
 inputsAction proof is = updateVar (utxo proof) (\u -> Map.withoutKeys u is)
 
 outputsAction :: Reflect era => Proof era -> TxBody era -> [TxOutF era] -> TraceM era ()