Made a test that required a UMap invalid for eras after Babbage.

Fix mkConwayTestAccountState which was calling era if the DRep was delegated.

Author: TimSheard

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Era.hs

@@ -20,7 +20,6 @@ import Cardano.Ledger.UMap
 import Data.Coerce
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
-import GHC.Stack
 import Lens.Micro
 import Test.Cardano.Ledger.Babbage.Era
 import Test.Cardano.Ledger.Conway.Arbitrary ()
@@ -54,20 +53,19 @@ instance BabbageEraTest ConwayEra
 
 instance ConwayEraTest ConwayEra
 
+-- | similar to mkShelleyTestAccountState, but it ignores the mPtr, and doesn't
+--   need to test that mDRep is SNothing, since this is the Conway Era, where DReps can be allocated.
 mkConwayTestAccountState ::
-  (HasCallStack, ConwayEraAccounts era) =>
+  ConwayEraAccounts era =>
   Maybe Ptr ->
   CompactForm Coin ->
   Maybe (KeyHash 'StakePool) ->
   Maybe DRep ->
   AccountState era
 mkConwayTestAccountState _mPtr deposit mStakePool mDRep =
-  case mDRep of
-    Nothing ->
-      mkConwayAccountState deposit
-        & stakePoolDelegationAccountStateL .~ mStakePool
-        & dRepDelegationAccountStateL .~ mDRep
-    Just _ -> error "Delegation to DRep is not supported until Conway"
+  mkConwayAccountState deposit
+    & stakePoolDelegationAccountStateL .~ mStakePool
+    & dRepDelegationAccountStateL .~ mDRep
 
 conwayAccountsToUMap :: ConwayEraAccounts era => Accounts era -> UMap
 conwayAccountsToUMap accounts =

libs/cardano-ledger-api/src/Cardano/Ledger/Api/State/Query.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE RecordWildCards #-}

libs/cardano-ledger-api/test/Test/Cardano/Ledger/Api/State/QuerySpec.hs

@@ -1,11 +1,13 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
+{-# OPTIONS_GHC -Wno-redundant-constraints #-}
 
 module Test.Cardano.Ledger.Api.State.QuerySpec (spec) where
 
@@ -65,20 +67,24 @@ spec = do
   queryStakePoolDelegsAndRewardsSpec @MaryEra
   queryStakePoolDelegsAndRewardsSpec @AlonzoEra
   queryStakePoolDelegsAndRewardsSpec @BabbageEra
-  queryStakePoolDelegsAndRewardsSpec @ConwayEra
+  -- queryStakePoolDelegsAndRewardsSpec @ConwayEra -- See comment about queryStakePoolDelegsAndRewardsSpec and eras
   describe "GetCommitteeMembersState" $ do
     committeeMembersStateSpec @ConwayEra
 
-queryStakePoolDelegsAndRewardsSpec :: forall era. ShelleyEraTest era => Spec
+-- | This does not make sense for Eras after Babbage. It requires only (ShelleyEraTest era)
+-- which pretends that from every era, one can extract a UMap.
+-- One cannot extract a UMap from the ConwayEra
+queryStakePoolDelegsAndRewardsSpec ::
+  forall era. (AtMostEra BabbageEra era, ShelleyEraTest era) => Spec
 queryStakePoolDelegsAndRewardsSpec =
   describe (eraName @era) $ do
     describe "GetFilteredDelegationsAndRewardAccounts" $ do
       prop "queryStakePoolDelegsAndRewards same as getFilteredDelegationsAndRewardAccounts" $
         forAll (genValidUMapWithCreds @era) $ \(umap :: UMap, creds) ->
           let nes :: NewEpochState era
               nes = def & nesEsL . esLStateL . lsCertStateL . certDStateL . accountsL .~ accountsFromUMap umap
-           in queryStakePoolDelegsAndRewards nes creds
-                `shouldBe` getFilteredDelegationsAndRewardAccounts umap creds
+           in (queryStakePoolDelegsAndRewards nes creds)
+                `shouldBe` (getFilteredDelegationsAndRewardAccounts umap creds)
 
 committeeMembersStateSpec ::
   forall era.