Merge pull request #5260 from IntersectMBO/jj/conway-cleanup

Conway cleanup

Author: lehins

eras/allegra/impl/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## 1.8.0.0
 
+* Remove `TriesToForgeADA`
+* Change the type of `actualSize` and `PParameterMaxValue` fields in `OutputTooBigUTxO` to `Int`
 * Added `COMPLETE` pragma for `TxCert AllegraEra`
 * Added `COMPLETE` pragma for `NativeScript AllegraEra`
 * Move to `testlib` `DecCBOR` instances for: `TxBody AllegraEra`, `AllegraTxAuxDataRaw`, `AllegraTxAuxData`, `TimelockRaw`, `Timelock`

eras/allegra/impl/src/Cardano/Ledger/Allegra/Rules/Utxo.hs

@@ -87,8 +87,6 @@ data AllegraUtxoPredFailure era
   | UpdateFailure (EraRuleFailure "PPUP" era) -- Subtransition Failures
   | OutputBootAddrAttrsTooBig
       [TxOut era] -- list of supplied bad transaction outputs
-  | -- Kept for backwards compatibility: no longer used because the `MultiAsset` type of mint doesn't allow for this possibility
-    TriesToForgeADA -- TODO: remove
   | OutputTooBigUTxO
       [TxOut era] -- list of supplied bad transaction outputs
   deriving (Generic)
@@ -361,7 +359,6 @@ instance
       WrongNetwork right wrongs -> Sum WrongNetwork 8 !> To right !> To wrongs
       WrongNetworkWithdrawal right wrongs -> Sum WrongNetworkWithdrawal 9 !> To right !> To wrongs
       OutputBootAddrAttrsTooBig outs -> Sum OutputBootAddrAttrsTooBig 10 !> To outs
-      TriesToForgeADA -> Sum TriesToForgeADA 11
       OutputTooBigUTxO outs -> Sum OutputTooBigUTxO 12 !> To outs
 
 instance
@@ -382,7 +379,6 @@ instance
     8 -> SumD WrongNetwork <! From <! From
     9 -> SumD WrongNetworkWithdrawal <! From <! From
     10 -> SumD OutputBootAddrAttrsTooBig <! From
-    11 -> SumD TriesToForgeADA
     12 -> SumD OutputTooBigUTxO <! From
     k -> Invalid k
 

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Rules/Utxo.hs

@@ -148,11 +148,9 @@ data AlonzoUtxoPredFailure era
   | -- | list of supplied bad transaction outputs
     OutputBootAddrAttrsTooBig
       [TxOut era]
-  | -- Kept for backwards compatibility: no longer used because the `MultiAsset` type of mint doesn't allow for this possibility
-    TriesToForgeADA
   | -- | list of supplied bad transaction output triples (actualSize,PParameterMaxValue,TxOut)
     OutputTooBigUTxO
-      [(Integer, Integer, TxOut era)]
+      [(Int, Int, TxOut era)]
   | InsufficientCollateral
       -- | balance computed
       DeltaCoin
@@ -645,8 +643,6 @@ encFail (WrongNetworkWithdrawal right wrongs) =
   Sum (WrongNetworkWithdrawal @era) 9 !> To right !> To wrongs
 encFail (OutputBootAddrAttrsTooBig outs) =
   Sum (OutputBootAddrAttrsTooBig @era) 10 !> To outs
-encFail TriesToForgeADA =
-  Sum TriesToForgeADA 11
 encFail (OutputTooBigUTxO outs) =
   Sum (OutputTooBigUTxO @era) 12 !> To outs
 encFail (InsufficientCollateral a b) =
@@ -685,11 +681,7 @@ decFail 7 = SumD UtxosFailure <! From
 decFail 8 = SumD WrongNetwork <! From <! From
 decFail 9 = SumD WrongNetworkWithdrawal <! From <! From
 decFail 10 = SumD OutputBootAddrAttrsTooBig <! From
-decFail 11 = SumD TriesToForgeADA
-decFail 12 =
-  let fromRestricted :: (Int, Int, TxOut era) -> (Integer, Integer, TxOut era)
-      fromRestricted (sz, mv, txOut) = (toInteger sz, toInteger mv, txOut)
-   in SumD OutputTooBigUTxO <! D (map fromRestricted <$> decCBOR)
+decFail 12 = SumD OutputTooBigUTxO <! From
 decFail 13 = SumD InsufficientCollateral <! From <! From
 decFail 14 = SumD ScriptsNotPaidUTxO <! D (UTxO <$> decCBOR)
 decFail 15 = SumD ExUnitsTooBigUTxO <! From
@@ -732,6 +724,5 @@ allegraToAlonzoUtxoPredFailure = \case
   Allegra.WrongNetworkWithdrawal x y -> WrongNetworkWithdrawal x y
   Allegra.OutputTooSmallUTxO x -> OutputTooSmallUTxO x
   Allegra.UpdateFailure x -> UtxosFailure (injectFailure @"UTXOS" @t x)
-  Allegra.OutputBootAddrAttrsTooBig xs -> OutputTooBigUTxO (map (0,0,) xs)
-  Allegra.TriesToForgeADA -> TriesToForgeADA
+  Allegra.OutputBootAddrAttrsTooBig xs -> OutputBootAddrAttrsTooBig xs
   Allegra.OutputTooBigUTxO xs -> OutputTooBigUTxO (map (0,0,) xs)

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

@@ -370,18 +370,7 @@ alonzoToConwayUtxoPredFailure = \case
   Alonzo.OutputTooSmallUTxO x -> OutputTooSmallUTxO x
   Alonzo.UtxosFailure x -> UtxosFailure x
   Alonzo.OutputBootAddrAttrsTooBig xs -> OutputBootAddrAttrsTooBig xs
-  Alonzo.TriesToForgeADA ->
-    error
-      "Impossible case, soon to be removed. See: https://github.com/IntersectMBO/cardano-ledger/issues/4085"
-  Alonzo.OutputTooBigUTxO xs ->
-    let
-      -- TODO: Remove this once the other eras will make the switch from Integer to Int
-      -- as per #4015.
-      -- https://github.com/IntersectMBO/cardano-ledger/issues/4085
-      toRestricted :: (Integer, Integer, TxOut era) -> (Int, Int, TxOut era)
-      toRestricted (sz, mv, out) = (fromIntegral sz, fromIntegral mv, out)
-     in
-      OutputTooBigUTxO $ map toRestricted xs
+  Alonzo.OutputTooBigUTxO xs -> OutputTooBigUTxO xs
   Alonzo.InsufficientCollateral c1 c2 -> InsufficientCollateral c1 c2
   Alonzo.ScriptsNotPaidUTxO u -> ScriptsNotPaidUTxO u
   Alonzo.ExUnitsTooBigUTxO m -> ExUnitsTooBigUTxO m
@@ -408,7 +397,4 @@ allegraToConwayUtxoPredFailure = \case
   Allegra.OutputTooSmallUTxO x -> OutputTooSmallUTxO x
   Allegra.UpdateFailure x -> absurdEraRule @"PPUP" @era x
   Allegra.OutputBootAddrAttrsTooBig xs -> OutputBootAddrAttrsTooBig xs
-  Allegra.TriesToForgeADA ->
-    error
-      "Impossible case, soon to be removed. See: https://github.com/IntersectMBO/cardano-ledger/issues/4085"
   Allegra.OutputTooBigUTxO xs -> OutputTooBigUTxO (map (0,0,) xs)

eras/shelley/impl/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.17.0.0
 
+* Remove `withCborRoundTripFailures` 
 * Refactor pool deposits to use `StakePoolState`. #5234
   * Update `Pool` rule to store deposits in individual `StakePoolState` records
   * Add and export `prUTxOStateL`, `prChainAccountStateL`, and `prCertStateL` lenses for `ShelleyPoolreapState`

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

@@ -133,7 +133,6 @@ module Test.Cardano.Ledger.Shelley.ImpTest (
   withNoFixup,
   withPostFixup,
   withPreFixup,
-  withCborRoundTripFailures,
   impNESL,
   impGlobalsL,
   impLastTickG,
@@ -260,7 +259,6 @@ import Numeric.Natural (Natural)
 import Prettyprinter (Doc)
 import Prettyprinter.Render.Terminal (AnsiStyle)
 import qualified System.Random.Stateful as R
-import Test.Cardano.Ledger.Binary.RoundTrip (roundTripCborRangeFailureExpectation)
 import Test.Cardano.Ledger.Core.Arbitrary ()
 import Test.Cardano.Ledger.Core.Binary.RoundTrip (roundTripEraExpectation)
 import Test.Cardano.Ledger.Core.KeyPair (ByronKeyPair (..), mkStakeRef, mkWitnessesVKey)
@@ -290,7 +288,6 @@ instance ShelleyEraImp era => ImpSpec (LedgerSpec era) where
         { impInitEnv =
             ImpTestEnv
               { iteFixup = fixupTx
-              , iteCborRoundTripFailures = True
               , itePostSubmitTxHook = \_ _ _ -> pure ()
               }
         , impInitState = initState
@@ -766,8 +763,6 @@ data ImpTestEnv era = ImpTestEnv
         (NonEmpty (PredicateFailure (EraRule "LEDGER" era)))
         (State (EraRule "LEDGER" era), [Event (EraRule "LEDGER" era)]) ->
       ImpM t ()
-  , iteCborRoundTripFailures :: Bool
-  -- ^ Expect failures in CBOR round trip serialization tests for predicate failures
   }
 
 iteFixupL :: Lens' (ImpTestEnv era) (Tx era -> ImpTestM era (Tx era))
@@ -787,9 +782,6 @@ itePostSubmitTxHookL ::
     )
 itePostSubmitTxHookL = lens itePostSubmitTxHook (\x y -> x {itePostSubmitTxHook = y})
 
-iteCborRoundTripFailuresL :: Lens' (ImpTestEnv era) Bool
-iteCborRoundTripFailuresL = lens iteCborRoundTripFailures (\x y -> x {iteCborRoundTripFailures = y})
-
 instance MonadWriter [SomeSTSEvent era] (ImpTestM era) where
   writer (x, evs) = (impEventsL %= (<> evs)) $> x
   listen act = do
@@ -1088,7 +1080,6 @@ trySubmitTx tx = do
   lEnv <- impLedgerEnv st
   ImpTestState {impRootTxIn} <- get
   res <- tryRunImpRule @"LEDGER" lEnv (st ^. nesEsL . esLStateL) txFixed
-  roundTripCheck <- asks iteCborRoundTripFailures
   globals <- use impGlobalsL
   let trc = TRC (lEnv, st ^. nesEsL . esLStateL, txFixed)
 
@@ -1098,14 +1089,7 @@ trySubmitTx tx = do
   case res of
     Left predFailures -> do
       -- Verify that produced predicate failures are ready for the node-to-client protocol
-      if roundTripCheck
-        then liftIO $ forM_ predFailures $ roundTripEraExpectation @era
-        else
-          liftIO $
-            roundTripCborRangeFailureExpectation
-              (eraProtVerLow @era)
-              (eraProtVerHigh @era)
-              predFailures
+      liftIO $ forM_ predFailures $ roundTripEraExpectation @era
       pure $ Left (predFailures, txFixed)
     Right (st', events) -> do
       let txId = TxId . hashAnnotated $ txFixed ^. bodyTxL
@@ -1580,9 +1564,6 @@ registerAndRetirePoolToMakeReward stakingCred = do
       & bodyTxL . certsTxBodyL .~ SSeq.singleton (RetirePoolTxCert poolId poolExpiry)
   passNEpochs $ fromIntegral poolLifetime
 
-withCborRoundTripFailures :: ImpTestM era a -> ImpTestM era a
-withCborRoundTripFailures = local $ iteCborRoundTripFailuresL .~ False
-
 -- | Compose given function with the configured fixup
 withCustomFixup ::
   ((Tx era -> ImpTestM era (Tx era)) -> Tx era -> ImpTestM era (Tx era)) ->