Merge pull request #5473 from IntersectMBO/carlos/update-fls-enable-tests-5

Update formal-ledger-specification and enable tests

Author: lehins

cabal.project

@@ -16,7 +16,7 @@ source-repository-package
   subdir: hs
   -- !WARNING!:
   -- MAKE SURE THIS POINTS TO A COMMIT IN `*-artifacts` BEFORE MERGE!
-  tag: 99420c6806ed42c4c2e8bb74c593d161fd821456
+  tag: 9291fe30190180631e79589c506a062e95123961
 
 source-repository-package
   type: git

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp/RatifySpec.hs

@@ -143,9 +143,7 @@ spoAndCCVotingSpec = do
 
       getLastEnactedParameterChange `shouldReturn` SNothing
       getsPParams ppMinFeeRefScriptCostPerByteL `shouldReturn` initialRefScriptBaseFee
-    -- https://github.com/IntersectMBO/cardano-ledger/issues/5418
-    -- TODO: Re-enable after issue is resolved, by removing this override
-    disableInConformanceIt "Committee proposals pass" $
+    it "Committee proposals pass" $
       whenPostBootstrap $ do
         modifyPParams $ \pp ->
           pp
@@ -233,9 +231,7 @@ spoAndCCVotingSpec = do
           constitutionActionId <- submitGovAction $ NewConstitution SNothing newConstitution
           logRatificationChecks constitutionActionId
           getConstitution `shouldNotReturn` newConstitution
-      -- https://github.com/IntersectMBO/cardano-ledger/issues/5418
-      -- TODO: Re-enable after issue is resolved, by removing this override
-      disableInConformanceIt
+      it
         "Constitution cannot be changed if committee is not active because it doesn't have registered hot credentials"
         $ whenPostBootstrap
         $ do
@@ -1123,9 +1119,7 @@ votingSpec =
           passNEpochs 2
           -- The same vote should now successfully ratify the proposal
           getLastEnactedCommittee `shouldReturn` SJust (GovPurposeId addCCGaid)
-        -- https://github.com/IntersectMBO/formal-ledger-specifications/issues/926
-        -- TODO: Re-enable after issue is resolved, by removing this override
-        disableInConformanceIt "Rewards contribute to active voting stake even in the absence of StakeDistr" $
+        it "Rewards contribute to active voting stake even in the absence of StakeDistr" $
           whenPostBootstrap $ do
             let govActionLifetime = 5
                 govActionDeposit = Coin 1_000_000

flake.lock

@@ -80,16 +80,12 @@ conformsToImplAccepted impl agda = property $ do
 
 spec :: Spec
 spec = describe "RATIFY" $ do
-  -- https://github.com/IntersectMBO/cardano-ledger/issues/5418
-  -- TODO: Re-enable after issue is resolved, by removing this override
-  xprop "STS" $ conformsToImplConstrained_ constrainedRatify
+  prop "STS" $ conformsToImplConstrained_ constrainedRatify
   describe "Accepted" $ do
     forM_
       [ ("DRep", (dRepAccepted, Agda.acceptedByDRep))
       , ("SPO", (spoAccepted, Agda.acceptedBySPO))
+      , ("CC", (committeeAccepted, Agda.acceptedByCC))
       ]
       $ \(l, (impl, agda)) ->
         prop l $ conformsToImplAccepted impl agda
-    -- https://github.com/IntersectMBO/cardano-ledger/issues/5418
-    -- TODO: Re-enable after issue is resolved, by removing this override
-    xprop "CC" $ conformsToImplAccepted committeeAccepted Agda.acceptedByCC