Use applyBlockEither instead of tryRunImpRule @"BBODY" in tryTxsInBlock

Author: neilmayhew

eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/Era.hs

@@ -21,7 +21,7 @@ import Cardano.Ledger.Core
 import Cardano.Ledger.Credential
 import Cardano.Ledger.Plutus (emptyCostModels)
 import Cardano.Ledger.Shelley
-import Cardano.Ledger.Shelley.API (ApplyTx)
+import Cardano.Ledger.Shelley.API (ApplyBlock, ApplyTx)
 import Cardano.Ledger.Shelley.LedgerState
 import Cardano.Ledger.Shelley.Scripts
 import Cardano.Ledger.Shelley.State
@@ -38,6 +38,7 @@ import Test.Cardano.Ledger.Shelley.TreeDiff ()
 
 class
   ( EraTest era
+  , ApplyBlock era
   , ApplyTx era
   , ShelleyEraScript era
   , EraTransition era

eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/ImpTest.hs

@@ -195,6 +195,7 @@ import Cardano.Ledger.Keys (
  )
 import Cardano.Ledger.Shelley (ShelleyEra)
 import Cardano.Ledger.Shelley.API.ByronTranslation (translateToShelleyLedgerStateFromUtxo)
+import Cardano.Ledger.Shelley.API.Validation (BlockTransitionError (..), applyBlockEither)
 import Cardano.Ledger.Shelley.AdaPots (sumAdaPots, totalAdaPotsES)
 import Cardano.Ledger.Shelley.Core
 import Cardano.Ledger.Shelley.Genesis (
@@ -211,7 +212,6 @@ import Cardano.Ledger.Shelley.LedgerState (
   esLStateL,
   lsCertStateL,
   lsUTxOStateL,
-  nesBcurL,
   nesELL,
   nesEsL,
   prevPParamsEpochStateL,
@@ -1426,24 +1426,21 @@ tryTxsInBlock act = do
     pure $ Block {blockHeader, blockBody}
 
   res <- do
+    globals <- use impGlobalsL
     let nes = startingState ^. impNESL
-        ls = nes ^. nesEsL . esLStateL
-        pp = nes ^. nesEsL . curPParamsEpochStateL @era
-        ca = nes ^. chainAccountStateL
-        bm = nes ^. nesBcurL
-    tryRunImpRule @"BBODY" (BbodyEnv pp ca) (BbodyState ls (BlocksMade bm)) block
+    pure $ applyBlockEither EPReturn ValidateAll globals nes block
 
   case res of
-    Left predFailures -> do
+    Left (BlockTransitionError predFailures) -> do
       put startingState
       -- Verify that produced predicate failures are ready for the node-to-client protocol
       liftIO $ forM_ predFailures $ roundTripEraExpectation @era
       pure $ Left (predFailures, block)
-    Right (BbodyState bbodyLedgerState _, events) -> do
+    Right (blockNes, events) -> do
       let stsEvents = SomeSTSEvent @era @"BBODY" <$> events
-          bbodyEvents = startingState ^. impEventsL <> Seq.fromList stsEvents
-      impNESL . nesEsL . esLStateL .= bbodyLedgerState
-      impEventsL .= bbodyEvents
+          blockEvents = startingState ^. impEventsL <> Seq.fromList stsEvents
+      impNESL .= blockNes
+      impEventsL .= blockEvents
 
       pure $ Right block