Remove redundant Embed instances

Author: lehins

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

@@ -57,7 +57,6 @@ import Cardano.Ledger.Coin (Coin)
 import Cardano.Ledger.Conway.Core
 import Cardano.Ledger.Conway.Era (
   ConwayCERTS,
-  ConwayDELEG,
   ConwayEra,
   ConwayGOV,
   ConwayLEDGER,
@@ -75,10 +74,9 @@ import Cardano.Ledger.Conway.Governance (
   proposalsWithPurpose,
  )
 import Cardano.Ledger.Conway.PParams (ConwayEraPParams (..))
-import Cardano.Ledger.Conway.Rules.Cert (CertEnv, ConwayCertEvent (..), ConwayCertPredFailure (..))
+import Cardano.Ledger.Conway.Rules.Cert (CertEnv, ConwayCertPredFailure (..))
 import Cardano.Ledger.Conway.Rules.Certs (
   CertsEnv (CertsEnv),
-  ConwayCertsEvent (..),
   ConwayCertsPredFailure (..),
   updateDormantDRepExpiries,
   updateVotingDRepExpiries,
@@ -621,18 +619,3 @@ instance
   where
   wrapFailed = ConwayGovFailure
   wrapEvent = GovEvent
-
-instance
-  ( EraPParams era
-  , EraRule "DELEG" era ~ ConwayDELEG era
-  , InjectRuleFailure "DELEG" ConwayDelegPredFailure era
-  , PredicateFailure (EraRule "CERTS" era) ~ ConwayCertsPredFailure era
-  , PredicateFailure (EraRule "CERT" era) ~ ConwayCertPredFailure era
-  , Event (EraRule "CERTS" era) ~ ConwayCertsEvent era
-  , Event (EraRule "CERT" era) ~ ConwayCertEvent era
-  , ConwayEraCertState era
-  ) =>
-  Embed (ConwayDELEG era) (ConwayLEDGER era)
-  where
-  wrapFailed = ConwayCertsFailure . CertFailure . DelegFailure
-  wrapEvent = CertsEvent . CertEvent . DelegEvent

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

@@ -40,7 +40,7 @@ import Cardano.Ledger.Conway.Governance (
   VotingProcedure (..),
   VotingProcedures (..),
  )
-import Cardano.Ledger.Conway.Rules (ConwayDELEG, ConwayDelegPredFailure (..), ConwayLEDGER)
+import Cardano.Ledger.Conway.Rules (ConwayDelegPredFailure (..))
 import Cardano.Ledger.Conway.Scripts (ConwayPlutusPurpose (..))
 import Cardano.Ledger.Conway.TxCert
 import Cardano.Ledger.Credential (Credential (..))
@@ -53,7 +53,6 @@ import Cardano.Ledger.Plutus.Data (
 import Cardano.Ledger.Plutus.Language (Language (..), plutusBinary)
 import Cardano.Ledger.State (StakePoolParams (sppId))
 import Cardano.Ledger.TxIn (TxId (..))
-import Control.State.Transition.Extended (Embed (..))
 import qualified Data.List.NonEmpty as NE
 import qualified Data.Map.Strict as Map
 import Data.Maybe (fromJust)
@@ -91,7 +90,7 @@ ledgerExamples =
   mkAlonzoBasedLedgerExamples
     ( ConwayApplyTxError $
         pure $
-          wrapFailed @(ConwayDELEG ConwayEra) @(ConwayLEDGER ConwayEra) $
+          injectFailure $
             DelegateeStakePoolNotRegisteredDELEG @ConwayEra (mkKeyHash 1)
     )
     exampleBabbageNewEpochState

eras/dijkstra/impl/src/Cardano/Ledger/Dijkstra/Rules/Ledger.hs

@@ -58,11 +58,8 @@ import Cardano.Ledger.Conway.Rules (
   CertEnv,
   CertsEnv (..),
   ConwayCERTS,
-  ConwayCertEvent (..),
   ConwayCertPredFailure (..),
-  ConwayCertsEvent (..),
   ConwayCertsPredFailure (..),
-  ConwayDELEG,
   ConwayDelegPredFailure,
   ConwayGovCertPredFailure,
   ConwayGovEvent,
@@ -660,21 +657,6 @@ instance
   wrapFailed = DijkstraCertsFailure
   wrapEvent = CertsEvent
 
-instance
-  ( EraPParams era
-  , EraRule "DELEG" era ~ ConwayDELEG era
-  , PredicateFailure (EraRule "CERTS" era) ~ ConwayCertsPredFailure era
-  , PredicateFailure (EraRule "CERT" era) ~ ConwayCertPredFailure era
-  , Event (EraRule "CERTS" era) ~ ConwayCertsEvent era
-  , Event (EraRule "CERT" era) ~ ConwayCertEvent era
-  , ConwayEraCertState era
-  , InjectRuleFailure "DELEG" ConwayDelegPredFailure era
-  ) =>
-  Embed (ConwayDELEG era) (DijkstraLEDGER era)
-  where
-  wrapFailed = DijkstraCertsFailure . CertFailure . DelegFailure
-  wrapEvent = CertsEvent . CertEvent . DelegEvent
-
 instance
   ( AlonzoEraTx era
   , AlonzoEraUTxO era

eras/dijkstra/impl/testlib/Test/Cardano/Ledger/Dijkstra/Examples.hs

@@ -24,12 +24,12 @@ import Cardano.Ledger.BaseTypes (
  )
 import Cardano.Ledger.Coin (Coin (..))
 import Cardano.Ledger.Conway.Core
-import Cardano.Ledger.Conway.Rules (ConwayDELEG, ConwayDelegPredFailure (..))
+import Cardano.Ledger.Conway.Rules (ConwayDelegPredFailure (..))
 import Cardano.Ledger.Conway.TxCert (ConwayGovCert (..), Delegatee (..))
 import Cardano.Ledger.Credential (Credential (..))
 import Cardano.Ledger.DRep (DRep (..))
 import Cardano.Ledger.Dijkstra (ApplyTxError (..), DijkstraEra)
-import Cardano.Ledger.Dijkstra.Rules (DijkstraLEDGER, DijkstraMEMPOOL)
+import qualified Cardano.Ledger.Dijkstra.Rules as Dijkstra
 import Cardano.Ledger.Dijkstra.Scripts (
   AccountBalanceInterval (..),
   AccountBalanceIntervals (..),
@@ -51,7 +51,6 @@ import Cardano.Ledger.Plutus.Data (
  )
 import Cardano.Ledger.Plutus.Language (Language (..), plutusBinary)
 import Cardano.Ledger.State (StakePoolParams (sppId))
-import Control.State.Transition.Extended (Embed (..))
 import qualified Data.List.NonEmpty as NE
 import qualified Data.Map.Strict as Map
 import qualified Data.OMap.Strict as OMap
@@ -92,8 +91,8 @@ ledgerExamples =
   mkAlonzoBasedLedgerExamples
     ( DijkstraApplyTxError $
         pure $
-          wrapFailed @(DijkstraLEDGER DijkstraEra) @(DijkstraMEMPOOL DijkstraEra) $
-            wrapFailed @(ConwayDELEG DijkstraEra) @(DijkstraLEDGER DijkstraEra) $
+          Dijkstra.LedgerFailure $
+            injectFailure $
               DelegateeStakePoolNotRegisteredDELEG (mkKeyHash 1)
     )
     exampleBabbageNewEpochState