Made predicate failures for TICK subrules Void in Shelley

eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Epoch.hs

@@ -83,12 +83,9 @@ import Cardano.Ledger.Shelley.Rewards ()
 import Cardano.Ledger.Shelley.Rules (
   ShelleyPOOLREAP,
   ShelleyPoolreapEvent,
-  ShelleyPoolreapPredFailure,
   ShelleyPoolreapState (..),
   ShelleySNAP,
-  ShelleySnapPredFailure,
   SnapEnv (..),
-  UpecPredFailure,
  )
 import qualified Cardano.Ledger.Shelley.Rules as Shelley
 import Cardano.Ledger.Slot (EpochNo)
@@ -164,8 +161,6 @@ instance
   , Environment (EraRule "POOLREAP" era) ~ ()
   , State (EraRule "POOLREAP" era) ~ ShelleyPoolreapState era
   , Signal (EraRule "POOLREAP" era) ~ EpochNo
-  , Eq (UpecPredFailure era)
-  , Show (UpecPredFailure era)
   , Embed (EraRule "RATIFY" era) (ConwayEPOCH era)
   , Environment (EraRule "RATIFY" era) ~ RatifyEnv era
   , GovState era ~ ConwayGovState era
@@ -258,8 +253,6 @@ epochTransition ::
   ( RunConwayRatify era
   , ConwayEraCertState era
   , EraTxOut era
-  , Eq (UpecPredFailure era)
-  , Show (UpecPredFailure era)
   , Environment (EraRule "SNAP" era) ~ SnapEnv era
   , State (EraRule "SNAP" era) ~ SnapShots
   , Signal (EraRule "SNAP" era) ~ ()
@@ -388,7 +381,6 @@ epochTransition = do
 instance
   ( Era era
   , STS (ShelleyPOOLREAP era)
-  , PredicateFailure (EraRule "POOLREAP" era) ~ ShelleyPoolreapPredFailure era
   , Event (EraRule "POOLREAP" era) ~ ShelleyPoolreapEvent era
   ) =>
   Embed (ShelleyPOOLREAP era) (ConwayEPOCH era)
@@ -400,7 +392,6 @@ instance
   ( EraTxOut era
   , EraStake era
   , EraCertState era
-  , PredicateFailure (EraRule "SNAP" era) ~ ShelleySnapPredFailure era
   , Event (EraRule "SNAP" era) ~ Shelley.SnapEvent era
   ) =>
   Embed (ShelleySNAP era) (ConwayEPOCH era)

eras/conway/impl/src/Cardano/Ledger/Conway/Rules/NewEpoch.hs

@@ -47,7 +47,6 @@ import Cardano.Ledger.Shelley.Rules (
   RupdEvent (..),
   ShelleyTICK,
   ShelleyTickEvent (..),
-  ShelleyTickPredFailure (..),
  )
 import Cardano.Ledger.Slot (EpochNo (EpochNo))
 import Cardano.Ledger.State
@@ -221,7 +220,7 @@ instance
   ) =>
   Embed (ConwayNEWEPOCH era) (ShelleyTICK era)
   where
-  wrapFailed = NewEpochFailure
+  wrapFailed = \case {}
   wrapEvent = TickNewEpochEvent
 
 instance

eras/shelley/impl/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## 1.17.0.0
 
+* Remove:
+  * `ShelleyEpochPredFailure`
+  * `ShelleyMirPredFailure`
+  * `ShelleyNewEpochPredFailure`
+  * `ShelleyPoolreapPredFailure`
+  * `ShelleyRupdPredFailure`
+  * `ShelleySnapPredFailure`
+  * `ShelleyTickPredFailure`
+  * `ShelleyTickfPredFailure`
+  * `ShelleyUpecPredFailure`
+  * `TickTransitionError`
+  * `UpecPredFailure`
 * Remove `withCborRoundTripFailures` 
 * Refactor pool deposits to use `StakePoolState`. #5234
   * Update `Pool` rule to store deposits in individual `StakePoolState` records

eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Validation.hs

@@ -21,7 +21,6 @@ module Cardano.Ledger.Shelley.API.Validation (
   applyBlockEitherNoEvents,
   applyBlockNoValidaton,
   applyTickNoEvents,
-  TickTransitionError (..),
   BlockTransitionError (..),
   chainChecks,
 ) where
@@ -223,22 +222,6 @@ updateNewEpochState ::
 updateNewEpochState ss (STS.BbodyState ls bcur) =
   LedgerState.updateNES ss bcur ls
 
-newtype TickTransitionError era
-  = TickTransitionError (NonEmpty (STS.PredicateFailure (EraRule "TICK" era)))
-  deriving (Generic)
-
-instance
-  NoThunks (STS.PredicateFailure (EraRule "TICK" era)) =>
-  NoThunks (TickTransitionError era)
-
-deriving stock instance
-  Eq (STS.PredicateFailure (EraRule "TICK" era)) =>
-  Eq (TickTransitionError era)
-
-deriving stock instance
-  Show (STS.PredicateFailure (EraRule "TICK" era)) =>
-  Show (TickTransitionError era)
-
 newtype BlockTransitionError era
   = BlockTransitionError (NonEmpty (STS.PredicateFailure (EraRule "BBODY" era)))
   deriving (Generic)

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Epoch.hs

@@ -1,8 +1,10 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE EmptyCase #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -15,10 +17,8 @@
 
 module Cardano.Ledger.Shelley.Rules.Epoch (
   ShelleyEPOCH,
-  ShelleyEpochPredFailure (..),
   ShelleyEpochEvent (..),
   PredicateFailure,
-  UpecPredFailure,
 ) where
 
 import Cardano.Ledger.BaseTypes (ShelleyBase)
@@ -47,16 +47,14 @@ import Cardano.Ledger.Shelley.Rewards ()
 import Cardano.Ledger.Shelley.Rules.PoolReap (
   ShelleyPOOLREAP,
   ShelleyPoolreapEvent,
-  ShelleyPoolreapPredFailure,
   ShelleyPoolreapState (..),
  )
 import Cardano.Ledger.Shelley.Rules.Snap (
   ShelleySNAP,
-  ShelleySnapPredFailure,
   SnapEnv (..),
   SnapEvent,
  )
-import Cardano.Ledger.Shelley.Rules.Upec (ShelleyUPEC, ShelleyUpecPredFailure, UpecState (..))
+import Cardano.Ledger.Shelley.Rules.Upec (ShelleyUPEC, UpecState (..))
 import Cardano.Ledger.Slot (EpochNo)
 import Cardano.Ledger.State
 import Control.DeepSeq (NFData)
@@ -72,46 +70,6 @@ import Data.Default (Default)
 import Data.Void (Void)
 import GHC.Generics (Generic)
 import Lens.Micro
-import NoThunks.Class (NoThunks (..))
-
-type UpecPredFailure era = UpecPredFailurePV (ProtVerLow era) era
-
-type family UpecPredFailurePV pv era where
-  UpecPredFailurePV 2 era = ShelleyUpecPredFailure era
-  UpecPredFailurePV 3 era = ShelleyUpecPredFailure era
-  UpecPredFailurePV 4 era = ShelleyUpecPredFailure era
-  UpecPredFailurePV 5 era = ShelleyUpecPredFailure era
-  UpecPredFailurePV 6 era = ShelleyUpecPredFailure era
-  UpecPredFailurePV 7 era = ShelleyUpecPredFailure era
-  UpecPredFailurePV 8 era = ShelleyUpecPredFailure era
-  UpecPredFailurePV _ era = Void
-
-data ShelleyEpochPredFailure era
-  = PoolReapFailure (PredicateFailure (EraRule "POOLREAP" era)) -- Subtransition Failures
-  | SnapFailure (PredicateFailure (EraRule "SNAP" era)) -- Subtransition Failures
-  | UpecFailure (UpecPredFailure era) -- Subtransition Failures
-  deriving (Generic)
-
-deriving stock instance
-  ( Eq (PredicateFailure (EraRule "POOLREAP" era))
-  , Eq (PredicateFailure (EraRule "SNAP" era))
-  , Eq (UpecPredFailure era)
-  ) =>
-  Eq (ShelleyEpochPredFailure era)
-
-deriving stock instance
-  ( Show (PredicateFailure (EraRule "POOLREAP" era))
-  , Show (PredicateFailure (EraRule "SNAP" era))
-  , Show (UpecPredFailure era)
-  ) =>
-  Show (ShelleyEpochPredFailure era)
-
-instance
-  ( NFData (PredicateFailure (EraRule "POOLREAP" era))
-  , NFData (PredicateFailure (EraRule "SNAP" era))
-  , NFData (UpecPredFailure era)
-  ) =>
-  NFData (ShelleyEpochPredFailure era)
 
 data ShelleyEpochEvent era
   = PoolReapEvent (Event (EraRule "POOLREAP" era))
@@ -152,26 +110,17 @@ instance
   , State (EraRule "UPEC" era) ~ UpecState era
   , Signal (EraRule "UPEC" era) ~ ()
   , Default (PParams era)
-  , Eq (UpecPredFailure era)
-  , Show (UpecPredFailure era)
   ) =>
   STS (ShelleyEPOCH era)
   where
   type State (ShelleyEPOCH era) = EpochState era
   type Signal (ShelleyEPOCH era) = EpochNo
   type Environment (ShelleyEPOCH era) = ()
   type BaseM (ShelleyEPOCH era) = ShelleyBase
-  type PredicateFailure (ShelleyEPOCH era) = ShelleyEpochPredFailure era
+  type PredicateFailure (ShelleyEPOCH era) = Void
   type Event (ShelleyEPOCH era) = ShelleyEpochEvent era
   transitionRules = [epochTransition]
 
-instance
-  ( NoThunks (PredicateFailure (EraRule "POOLREAP" era))
-  , NoThunks (PredicateFailure (EraRule "SNAP" era))
-  , NoThunks (UpecPredFailure era)
-  ) =>
-  NoThunks (ShelleyEpochPredFailure era)
-
 epochTransition ::
   forall era.
   ( Embed (EraRule "SNAP" era) (ShelleyEPOCH era)
@@ -237,33 +186,30 @@ epochTransition = do
 instance
   ( EraTxOut era
   , EraStake era
-  , PredicateFailure (EraRule "SNAP" era) ~ ShelleySnapPredFailure era
   , Event (EraRule "SNAP" era) ~ SnapEvent era
   , EraCertState era
   ) =>
   Embed (ShelleySNAP era) (ShelleyEPOCH era)
   where
-  wrapFailed = SnapFailure
+  wrapFailed = \case {}
   wrapEvent = SnapEvent
 
 instance
   ( Era era
   , STS (ShelleyPOOLREAP era)
-  , PredicateFailure (EraRule "POOLREAP" era) ~ ShelleyPoolreapPredFailure era
   , Event (EraRule "POOLREAP" era) ~ ShelleyPoolreapEvent era
   ) =>
   Embed (ShelleyPOOLREAP era) (ShelleyEPOCH era)
   where
-  wrapFailed = PoolReapFailure
+  wrapFailed = \case {}
   wrapEvent = PoolReapEvent
 
 instance
   ( Era era
   , STS (ShelleyUPEC era)
-  , UpecPredFailure era ~ ShelleyUpecPredFailure era
   , Event (EraRule "UPEC" era) ~ Void
   ) =>
   Embed (ShelleyUPEC era) (ShelleyEPOCH era)
   where
-  wrapFailed = UpecFailure
+  wrapFailed = \case {}
   wrapEvent = UpecEvent

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Mir.hs

@@ -14,7 +14,6 @@
 module Cardano.Ledger.Shelley.Rules.Mir (
   ShelleyMIR,
   PredicateFailure,
-  ShelleyMirPredFailure,
   ShelleyMirEvent (..),
   emptyInstantaneousRewards,
 ) where
@@ -51,14 +50,9 @@ import Control.State.Transition (
 import Data.Default (Default)
 import Data.Foldable (fold)
 import qualified Data.Map.Strict as Map
+import Data.Void (Void)
 import GHC.Generics (Generic)
 import Lens.Micro
-import NoThunks.Class (NoThunks (..))
-
-data ShelleyMirPredFailure era
-  deriving (Show, Generic, Eq)
-
-instance NFData (ShelleyMirPredFailure era)
 
 data ShelleyMirEvent era
   = MirTransfer InstantaneousRewards
@@ -72,8 +66,6 @@ deriving instance Eq (ShelleyMirEvent era)
 
 instance NFData (ShelleyMirEvent era)
 
-instance NoThunks (ShelleyMirPredFailure era)
-
 instance
   ( Default (EpochState era)
   , EraGov era
@@ -86,7 +78,7 @@ instance
   type Environment (ShelleyMIR era) = ()
   type BaseM (ShelleyMIR era) = ShelleyBase
   type Event (ShelleyMIR era) = ShelleyMirEvent era
-  type PredicateFailure (ShelleyMIR era) = ShelleyMirPredFailure era
+  type PredicateFailure (ShelleyMIR era) = Void
 
   transitionRules = [mirTransition]