Avoid going through OverlaySlots.

This PR now collects the `OverlaySchedule` directly in `BBodyEnv`,
removing the need for overlaySlots and hopefully avoiding an expensive
call to `Map.keysSet`. It should be functionally equivalent to #1775
whilst allowing us to optimise further in making the overlay schedule
non-explicit.

shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Validation.hs

@@ -28,7 +28,6 @@ import Shelley.Spec.Ledger.BlockChain
 import Shelley.Spec.Ledger.Crypto
 import Shelley.Spec.Ledger.Keys
 import qualified Shelley.Spec.Ledger.LedgerState as LedgerState
-import Shelley.Spec.Ledger.OverlaySchedule (overlaySlots)
 import Shelley.Spec.Ledger.PParams (PParams)
 import qualified Shelley.Spec.Ledger.STS.Bbody as STS
 import qualified Shelley.Spec.Ledger.STS.Chain as STS
@@ -62,14 +61,14 @@ mkTickEnv = STS.TickEnv . LedgerState.getGKeys
 
 mkBbodyEnv ::
  ShelleyState crypto ->
- STS.BbodyEnv
+ STS.BbodyEnv crypto
 mkBbodyEnv
  LedgerState.NewEpochState
  { LedgerState.nesOsched,
  LedgerState.nesEs
  } =
  STS.BbodyEnv
- { STS.bbodySlots = overlaySlots nesOsched,
+ { STS.bbodySlots = nesOsched,
  STS.bbodyPp = LedgerState.esPp nesEs,
  STS.bbodyAccount = LedgerState.esAccountState nesEs
  }

shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/OverlaySchedule.hs

@@ -7,7 +7,6 @@
 module Shelley.Spec.Ledger.OverlaySchedule
  ( -- * Overlay schedule
  OverlaySchedule,
- OverlaySlots,
  compactOverlaySchedule,
  decompactOverlaySchedule,
  emptyOverlaySchedule,
@@ -17,7 +16,6 @@ module Shelley.Spec.Ledger.OverlaySchedule
  overlayScheduleHelper,
  overlayScheduleIsEmpty,
  overlayScheduleToMap,
- overlaySlots,
 
  -- * OBftSlot (for testing)
  OBftSlot (..),
@@ -182,10 +180,5 @@ instance Crypto crypto => ToCBOR (OverlaySchedule crypto) where
 instance Crypto crypto => FromCBOR (OverlaySchedule crypto) where
  fromCBOR = decompactOverlaySchedule <$> fromCBOR
 
-newtype OverlaySlots = OverlaySlots (Set SlotNo)
-
-overlaySlots :: OverlaySchedule crypto -> OverlaySlots
-overlaySlots (OverlaySchedule oSched) = OverlaySlots (Map.keysSet oSched)
-
-isOverlaySlot :: SlotNo -> OverlaySlots -> Bool
-isOverlaySlot slot (OverlaySlots oslots) = Set.member slot oslots
+isOverlaySlot :: SlotNo -> OverlaySchedule c -> Bool
+isOverlaySlot slot (OverlaySchedule oslots) = Map.member slot oslots

shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Bbody.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
@@ -50,7 +51,7 @@ import Shelley.Spec.Ledger.LedgerState
  LedgerState,
  )
 import Shelley.Spec.Ledger.OverlaySchedule
- ( OverlaySlots,
+ ( OverlaySchedule,
  isOverlaySlot,
  )
 import Shelley.Spec.Ledger.PParams (PParams)
@@ -63,8 +64,8 @@ data BbodyState crypto
  = BbodyState (LedgerState crypto) (BlocksMade crypto)
  deriving (Eq, Show)
 
-data BbodyEnv = BbodyEnv
- { bbodySlots :: OverlaySlots,
+data BbodyEnv crypto = BbodyEnv
+ { bbodySlots :: OverlaySchedule crypto,
  bbodyPp :: PParams,
  bbodyAccount :: AccountState
  }
@@ -83,7 +84,7 @@ instance
  Signal (BBODY crypto) =
  Block crypto
 
- type Environment (BBODY crypto) = BbodyEnv
+ type Environment (BBODY crypto) = BbodyEnv crypto
 
  type BaseM (BBODY crypto) = ShelleyBase
 

shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Chain.hs

@@ -295,7 +295,7 @@ chainTransition =
 
  BbodyState ls' bcur' <-
  trans @(BBODY crypto) $
- TRC (BbodyEnv (overlaySlots osched) pp' account, BbodyState ls bcur, block)
+ TRC (BbodyEnv osched pp' account, BbodyState ls bcur, block)
 
  let nes'' = updateNES nes' bcur' ls'
  bhb = bhbody bh