Bump cardano-ledger-executable-spec

IntersectMBO · Apr 29, 2024 · a1b93fb · a1b93fb
1 parent 3939a55
commit a1b93fb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/cabal.project b/cabal.project
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-executable-spec.git
-  tag: 1ffb1d13b8892c0943780cd7bd9e2724b5c20cab
-  --sha256: sha256-iiC0AwhPce6XnaGYHyQBeMSIttvn2c+Legu0tUgYOEM=
+  tag: 1a32ee99287b722bda539fb08e9757270f839396
+  --sha256: sha256-8f9Oq/Z7bTCbiUKqCrzIopAd9qlAqLHtSpll7+tcJQE=
 
 index-state:
   -- Bump this if you need newer packages from Hackage

diff --git a/libs/cardano-ledger-conformance/src/Test/Cardano/Ledger/Conformance/ExecSpecRule/Core.hs b/libs/cardano-ledger-conformance/src/Test/Cardano/Ledger/Conformance/ExecSpecRule/Core.hs
@@ -26,6 +26,7 @@ import Data.Bifunctor (Bifunctor (..))
 import Data.Bitraversable (bimapM)
 import Data.Functor (($>))
 import Data.Typeable (Proxy (..), Typeable, showsTypeRep, typeRep)
+import Debug.Trace (trace)
 import GHC.Base (Constraint, NonEmpty, Symbol, Type)
 import GHC.TypeLits (KnownSymbol)
 import qualified Lib as Agda
@@ -202,11 +203,12 @@ conformsToImpl ::
   Property
 conformsToImpl =
   let envSpec = simplifySpec $ environmentSpec @fn @rule @era
-   in forAllShrinkShow (CV2.genFromSpec_ envSpec) (shrinkWithSpec envSpec) showExpr $ \env ->
+      debugTrace x = trace (showExpr x) x
+   in forAllShrinkShow (CV2.genFromSpec_ envSpec) (shrinkWithSpec envSpec . debugTrace) showExpr $ \env ->
         let stSpec = simplifySpec $ stateSpec @fn @rule @era env
-         in forAllShrinkShow (CV2.genFromSpec_ stSpec) (shrinkWithSpec stSpec) showExpr $ \st ->
+         in forAllShrinkShow (CV2.genFromSpec_ stSpec) (shrinkWithSpec stSpec . debugTrace) showExpr $ \st ->
               let sigSpec = simplifySpec $ signalSpec @fn @rule @era env st
-               in forAllShrinkShow (CV2.genFromSpec_ sigSpec) (shrinkWithSpec sigSpec) showExpr $ \sig ->
+               in forAllShrinkShow (CV2.genFromSpec_ sigSpec) (shrinkWithSpec sigSpec . debugTrace) showExpr $ \sig ->
                     do
                       (implResTest, agdaResTest) <- runConformance @rule @fn @era env st sig
                       let

diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/Gov.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/Gov.hs
@@ -129,23 +129,25 @@ govProposalsSpec GovEnv {geEpoch, gePPolicy} =
             -- Info
             (branch $ \_ -> True)
       , genHint listSizeHint unorderedProposals
-      , assertReified
+      , reify
           ( pair_
               (pair_ (pair_ ppupTree hardForkTree) constitutionTree)
               committeeTree
           )
-          $ \(((t0, t1), t2), t3) ->
-            unique $
-              mconcat
-                [ govActionIds t0
-                , govActionIds t1
-                , govActionIds t2
-                , govActionIds t3
-                ]
+          ( \(((t0, t1), t2), t3) ->
+              unique $
+                mconcat
+                  [ govActionIds t0
+                  , govActionIds t1
+                  , govActionIds t2
+                  , govActionIds t3
+                  ]
+          )
+          assert
       ]
   where
-    treeGenHint = (Just 2, 10)
-    listSizeHint = 5
+    treeGenHint = (Just 2, 1)
+    listSizeHint = 3
     govActionIds :: ProposalTree -> [GovActionId StandardCrypto]
     govActionIds (root, forest) = rootId <> concatMap treeIds forest
       where

diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/Instances.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/Instances.hs
@@ -760,7 +760,8 @@ instance HasSimpleRep Vote
 instance IsConwayUniv fn => HasSpec fn Vote
 
 instance HasSimpleRep (GovActionId c)
-instance (IsConwayUniv fn, Crypto c) => HasSpec fn (GovActionId c)
+instance (IsConwayUniv fn, Crypto c) => HasSpec fn (GovActionId c) where
+  shrinkWithTypeSpec _ _ = []
 
 instance HasSimpleRep GovActionIx
 instance IsConwayUniv fn => HasSpec fn GovActionIx