Review remarks part 1

.gitignore

@@ -7,6 +7,7 @@
 /cabal.project.old
 configuration/defaults/simpleview/genesis/
 configuration/defaults/liveview/genesis/
+dist-newstyle
 dist-newstyle/
 dist-profiled/
 dist/

cardano-testnet/src/Testnet/Components/Query.hs

@@ -476,6 +476,8 @@ assertNewEpochState epochStateView sbe maxWait lens expected = withFrozenCallSta
   mStateView <- watchEpochStateUpdate epochStateView maxWait (const checkEpochState)
   when (isNothing mStateView) $ do
     val <- getFromEpochStateForEra
+    -- there's a tiny tiny chance that the value has changed since 'watchEpochStateUpdate'
+    -- so check it again
     if val == expected
     then pure ()
     else H.failMessage callStack $ unlines

cardano-testnet/src/Testnet/EpochStateProcessing.hs

@@ -10,7 +10,6 @@ module Testnet.EpochStateProcessing
 import           Cardano.Api
 import           Cardano.Api.Ledger (EpochInterval (..), GovActionId (..))
 import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (ShelleyLedgerEra)
 
 import qualified Cardano.Ledger.Conway.Governance as L
 import qualified Cardano.Ledger.Shelley.API as L
@@ -20,7 +19,6 @@ import qualified Cardano.Ledger.Shelley.LedgerState as L
 import           Prelude
 
 import           Control.Monad
-import           Data.Data ((:~:) (..))
 import qualified Data.Map as Map
 import           Data.Maybe
 import           Data.Word (Word32)
@@ -29,7 +27,6 @@ import           GHC.Stack
 import           Lens.Micro (to, (^.))
 
 import           Testnet.Components.Query (EpochStateView, watchEpochStateUpdate)
-import           Testnet.Property.Assert (assertErasEqual)
 
 import           Hedgehog
 import           Hedgehog.Extras (MonadAssertion)
@@ -55,15 +52,14 @@ maybeExtractGovernanceActionIndex txid (AnyNewEpochState sbe newEpochState) =
 
 -- | Wait for the last gov action proposal in the list to have DRep or SPO votes.
 waitForGovActionVotes
-  :: forall m era. HasCallStack
+  :: forall m. HasCallStack
   => MonadAssertion m
   => MonadTest m
   => MonadIO m
   => EpochStateView -- ^ Current epoch state view. It can be obtained using the 'getEpochStateView' function.
-  -> ConwayEraOnwards era -- ^ The ConwayEraOnwards witness for current era.
   -> EpochInterval -- ^ The maximum wait time in epochs.
   -> m ()
-waitForGovActionVotes epochStateView ceo maxWait = withFrozenCallStack $ do
+waitForGovActionVotes epochStateView maxWait = withFrozenCallStack $ do
   mResult <- watchEpochStateUpdate epochStateView maxWait checkForVotes
   when (isNothing mResult) $
     H.failMessage callStack "waitForGovActionVotes: No votes appeared before timeout."
@@ -72,19 +68,21 @@ waitForGovActionVotes epochStateView ceo maxWait = withFrozenCallStack $ do
       :: HasCallStack
       => (AnyNewEpochState, SlotNo, BlockNo)
       -> m (Maybe ())
-    checkForVotes (AnyNewEpochState actualEra newEpochState, _, _) = do
-      let sbe = conwayEraOnwardsToShelleyBasedEra ceo
-      Refl <- H.leftFail $ assertErasEqual sbe actualEra
-      let govState :: L.ConwayGovState (ShelleyLedgerEra era)
-          govState = conwayEraOnwardsConstraints ceo $ newEpochState ^. newEpochStateGovStateL
-          proposals = govState ^. L.cgsProposalsL . L.pPropsL . to toList
-      if null proposals
-        then pure Nothing
-        else do
-          let lastProposal = last proposals
-              gaDRepVotes = lastProposal ^. L.gasDRepVotesL . to toList
-              gaSpoVotes = lastProposal ^. L.gasStakePoolVotesL . to toList
-          if null gaDRepVotes && null gaSpoVotes
-          then pure Nothing
-          else pure $ Just ()
+    checkForVotes (AnyNewEpochState actualEra newEpochState, _, _) = withFrozenCallStack $ do
+      caseShelleyToBabbageOrConwayEraOnwards
+        (const $ H.note_ "Only Conway era onwards is supported" >> failure)
+        (\ceo -> do
+          let govState = conwayEraOnwardsConstraints ceo $ newEpochState ^. newEpochStateGovStateL
+              proposals = govState ^. L.cgsProposalsL . L.pPropsL . to toList
+          if null proposals
+            then pure Nothing
+            else do
+              let lastProposal = last proposals
+                  gaDRepVotes = lastProposal ^. L.gasDRepVotesL . to toList
+                  gaSpoVotes = lastProposal ^. L.gasStakePoolVotesL . to toList
+              if null gaDRepVotes && null gaSpoVotes
+              then pure Nothing
+              else pure $ Just ()
+        )
+        actualEra
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/CommitteeAddNew.hs

@@ -208,7 +208,7 @@ hprop_constitutional_committee_add_new = integrationWorkspace "constitutional-co
 
   submitTx execConfig cEra voteTxFp
 
-  waitForGovActionVotes epochStateView ceo (L.EpochInterval 1)
+  waitForGovActionVotes epochStateView (L.EpochInterval 1)
 
   govState <- getGovState epochStateView ceo
   govActionState <- H.headM $ govState ^. L.cgsProposalsL . L.pPropsL . to toList

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs

@@ -199,9 +199,11 @@ activityChangeProposalTest execConfig epochStateView ceo work prefix
   (EpochNo epochAfterProp) <- getCurrentEpochNo epochStateView
   H.note_ $ "Epoch after \"" <> prefix <> "\" prop: " <> show epochAfterProp
 
+  -- Wait for the number of epochs for an enactment of the change
   void $ waitForEpochs epochStateView minWait
 
   forM_ mExpected $
+    -- enactment check
     assertNewEpochState epochStateView sbe maxWait
       (nesEpochStateL . epochStateGovStateL . curPParamsGovStateL . ppDRepActivityL)
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs

@@ -185,7 +185,7 @@ hprop_ledger_events_propose_new_constitution = integrationWorkspace "propose-new
 
   submitTx execConfig cEra voteTxFp
 
-  waitForGovActionVotes epochStateView ceo (EpochInterval 1)
+  waitForGovActionVotes epochStateView (EpochInterval 1)
 
   -- Count votes before checking for ratification. It may happen that the proposal gets removed after
   -- ratification because of a long waiting time, so we won't be able to access votes.