Merge pull request #5332 from IntersectMBO/lehins/remove-size-from-enc-cbor

Remove size estimation from `EncCBOR` and `EncCBORGroup`

Author: lehins

eras/alonzo/impl/cardano-ledger-alonzo.cabal

@@ -86,7 +86,7 @@ library
     cardano-crypto-class,
     cardano-data ^>=1.2.1,
     cardano-ledger-allegra ^>=1.9,
-    cardano-ledger-binary ^>=1.7,
+    cardano-ledger-binary ^>=1.8,
     cardano-ledger-core:{cardano-ledger-core, internal} ^>=1.19,
     cardano-ledger-mary ^>=1.9,
     cardano-ledger-shelley ^>=1.17,

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/BlockBody/Internal.hs

@@ -42,7 +42,6 @@ import Cardano.Ledger.Binary (
   encodeFoldableEncoder,
   encodeFoldableMapEncoder,
   encodePreEncoded,
-  encodedSizeExpr,
   serialize,
   withSlice,
  )
@@ -54,7 +53,6 @@ import Data.ByteString.Builder (Builder, shortByteString, toLazyByteString)
 import qualified Data.ByteString.Lazy as BSL
 import Data.Coerce (coerce)
 import Data.Maybe.Strict (maybeToStrictMaybe, strictMaybeToMaybe)
-import Data.Proxy (Proxy (..))
 import qualified Data.Sequence as Seq
 import Data.Sequence.Strict (StrictSeq)
 import qualified Data.Sequence.Strict as StrictSeq
@@ -178,11 +176,6 @@ instance Era era => EncCBORGroup (AlonzoBlockBody era) where
     encodePreEncoded $
       BSL.toStrict $
         bodyBytes <> witsBytes <> metadataBytes <> invalidBytes
-  encodedGroupSizeExpr size _proxy =
-    encodedSizeExpr size (Proxy :: Proxy ByteString)
-      + encodedSizeExpr size (Proxy :: Proxy ByteString)
-      + encodedSizeExpr size (Proxy :: Proxy ByteString)
-      + encodedSizeExpr size (Proxy :: Proxy ByteString)
   listLen _ = 4
   listLenBound _ = 4
 

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

@@ -146,12 +146,7 @@ deriving anyclass instance
   (Era era, NoThunks (PredicateFailure (EraRule "LEDGERS" era))) =>
   NoThunks (AlonzoBbodyPredFailure era)
 
-instance
-  ( Typeable era
-  , EncCBOR (ShelleyBbodyPredFailure era)
-  ) =>
-  EncCBOR (AlonzoBbodyPredFailure era)
-  where
+instance EncCBOR (ShelleyBbodyPredFailure era) => EncCBOR (AlonzoBbodyPredFailure era) where
   encCBOR (ShelleyInAlonzoBbodyPredFailure x) = encode (Sum ShelleyInAlonzoBbodyPredFailure 0 !> To x)
   encCBOR (TooManyExUnits m) = encode (Sum TooManyExUnits 1 !> To m)
 

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

@@ -180,9 +180,7 @@ instance
 
 instance
   ( AlonzoEraScript era
-  , EncCBOR (TxCert era)
   , EncCBOR (PredicateFailure (EraRule "UTXO" era))
-  , Typeable (TxAuxData era)
   ) =>
   EncCBOR (AlonzoUtxowPredFailure era)
   where

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs

@@ -116,7 +116,7 @@ import qualified Data.Map.Strict as Map
 import Data.Maybe (fromJust, isJust)
 import Data.MemPack
 import Data.Typeable
-import Data.Word (Word16, Word32, Word8)
+import Data.Word (Word32)
 import GHC.Generics (Generic)
 import GHC.Stack
 import NoThunks.Class (NoThunks (..))
@@ -331,7 +331,6 @@ instance
 instance
   ( forall a b. (EncCBOR a, EncCBOR b) => EncCBOR (f a b)
   , Era era
-  , Typeable f
   , EncCBOR (TxCert era)
   ) =>
   EncCBORGroup (AlonzoPlutusPurpose f era)
@@ -343,9 +342,6 @@ instance
     AlonzoMinting p -> encodeWord8 1 <> encCBOR p
     AlonzoCertifying p -> encodeWord8 2 <> encCBOR p
     AlonzoRewarding p -> encodeWord8 3 <> encCBOR p
-  encodedGroupSizeExpr size_ _proxy =
-    encodedSizeExpr size_ (Proxy :: Proxy Word8)
-      + encodedSizeExpr size_ (Proxy :: Proxy Word16)
 
 instance
   ( forall a b. (DecCBOR a, DecCBOR b) => DecCBOR (f a b)
@@ -368,7 +364,6 @@ deriving via
   instance
     ( forall a b. (EncCBOR a, EncCBOR b) => EncCBOR (f a b)
     , Era era
-    , Typeable f
     , EncCBOR (TxCert era)
     ) =>
     EncCBOR (AlonzoPlutusPurpose f era)

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxWits.hs

@@ -135,7 +135,6 @@ import qualified Data.MapExtras as Map (fromElems)
 import Data.Maybe (mapMaybe)
 import Data.Set (Set)
 import qualified Data.Set as Set
-import Data.Typeable (Typeable)
 import GHC.Generics (Generic)
 import Lens.Micro
 import NoThunks.Class (NoThunks)
@@ -312,7 +311,7 @@ newtype TxDatsRaw era = TxDatsRaw {unTxDatsRaw :: Map DataHash (Data era)}
 
 deriving instance Show (TxDatsRaw era)
 
-instance (Typeable era, EncCBOR (Data era)) => EncCBOR (TxDatsRaw era) where
+instance EncCBOR (Data era) => EncCBOR (TxDatsRaw era) where
   encCBOR = encodeWithSetTag . Map.elems . unTxDatsRaw
 
 pattern TxDats' :: Map DataHash (Data era) -> TxDats era

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/Binary/Twiddle.hs

@@ -21,7 +21,6 @@ import Cardano.Ledger.TxIn (TxIn)
 import Cardano.Ledger.Val (Val)
 import Codec.CBOR.Term (Term (..))
 import Data.Maybe (catMaybes)
-import Data.Typeable (Typeable)
 import Test.Cardano.Ledger.Alonzo.Arbitrary ()
 import Test.Cardano.Ledger.Binary.Twiddle
 import Test.Cardano.Ledger.Common
@@ -50,7 +49,7 @@ instance Twiddle MultiAsset where
 instance Twiddle ScriptIntegrityHash where
   twiddle v = twiddle v . toTerm v
 
-instance Typeable t => Twiddle (KeyHash t) where
+instance Twiddle (KeyHash t) where
   twiddle v = twiddle v . toTerm v
 
 instance Twiddle Network where

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/Translation/TranslationInstance.hs

@@ -177,7 +177,6 @@ instance DecCBOR VersionedTxInfo where
 
 instance
   ( Era era
-  , EncCBOR (PParams era)
   , EncCBOR (UTxO era)
   , EncCBOR (Core.Tx era)
   ) =>

eras/babbage/impl/src/Cardano/Ledger/Babbage/Rules/Utxo.hs

@@ -498,10 +498,7 @@ instance
   , EncCBOR (TxOut era)
   , EncCBOR (Value era)
   , EncCBOR (PredicateFailure (EraRule "UTXOS" era))
-  , EncCBOR (PredicateFailure (EraRule "UTXO" era))
-  , EncCBOR (Script era)
   , EncCBOR TxIn
-  , Typeable (TxAuxData era)
   ) =>
   EncCBOR (BabbageUtxoPredFailure era)
   where

eras/babbage/impl/src/Cardano/Ledger/Babbage/Rules/Utxow.hs

@@ -157,12 +157,7 @@ deriving instance
 
 instance
   ( AlonzoEraScript era
-  , EncCBOR (TxOut era)
-  , EncCBOR (TxCert era)
-  , EncCBOR (Value era)
-  , EncCBOR (PredicateFailure (EraRule "UTXOS" era))
   , EncCBOR (PredicateFailure (EraRule "UTXO" era))
-  , Typeable (TxAuxData era)
   ) =>
   EncCBOR (BabbageUtxowPredFailure era)
   where