Remove unnecessary functions

cardano-api/src/Cardano/Api/Fees.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE EmptyCase #-}
 {-# LANGUAGE FlexibleContexts #-}

cardano-api/src/Cardano/Api/TxBody.hs

@@ -2724,7 +2724,7 @@ fromLedgerTxOuts era body scriptdata =
       , txouts <- toList (Babbage.outputs body)
       ]
     ShelleyBasedEraConway ->
-      [ fromConwayTxOut
+      [ fromBabbageTxOut
           MultiAssetInConwayEra
           ScriptDataInConwayEra
           ReferenceTxInsScriptsInlineDatumsInConwayEra
@@ -2807,47 +2807,6 @@ fromBabbageTxOut multiAssetInEra scriptDataInEra inlineDatumsInEra txdatums txou
 
    (BabbageTxOut addr val datum mRefScript) = txout
 
-fromConwayTxOut
-  :: forall ledgerera era. Ledger.Era ledgerera
-  => IsShelleyBasedEra era
-  => ShelleyLedgerEra era ~ ledgerera
-  => Ledger.Crypto ledgerera ~ StandardCrypto
-  => Ledger.Value ledgerera ~ MaryValue StandardCrypto
-  => MultiAssetSupportedInEra era
-  -> ScriptDataSupportedInEra era
-  -> ReferenceTxInsScriptsInlineDatumsSupportedInEra era
-  -> Map (Alonzo.DataHash StandardCrypto)
-         (Alonzo.Data ledgerera)
-  -> BabbageTxOut ledgerera
-  -> TxOut CtxTx era
-fromConwayTxOut multiAssetInEra scriptDataInEra inlineDatumsInEra txdatums txout =
-   TxOut
-     (fromShelleyAddr shelleyBasedEra addr)
-     (TxOutValue multiAssetInEra (fromMaryValue val))
-     conwayTxOutDatum
-     (case mRefScript of
-       SNothing -> ReferenceScriptNone
-       SJust rScript -> fromShelleyScriptToReferenceScript shelleyBasedEra rScript
-     )
- where
-   -- NOTE: This is different to 'fromConwayTxOutDatum' as it may resolve
-   -- 'DatumHash' values using the datums included in the transaction.
-   conwayTxOutDatum :: TxOutDatum CtxTx era
-   conwayTxOutDatum =
-     case datum of
-       Babbage.NoDatum -> TxOutDatumNone
-       Babbage.DatumHash dh -> resolveDatumInTx dh
-       Babbage.Datum d ->
-         TxOutDatumInline inlineDatumsInEra $
-           binaryDataToScriptData inlineDatumsInEra d
-
-   resolveDatumInTx :: Alonzo.DataHash StandardCrypto -> TxOutDatum CtxTx era
-   resolveDatumInTx dh
-      | Just d <- Map.lookup dh txdatums
-                  = TxOutDatumInTx' scriptDataInEra (ScriptDataHash dh) (fromAlonzoData d)
-      | otherwise = TxOutDatumHash scriptDataInEra (ScriptDataHash dh)
-
-   (BabbageTxOut addr val datum mRefScript) = txout
 
 fromLedgerTxTotalCollateral
   :: ShelleyBasedEra era

cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs

@@ -949,9 +949,9 @@ instance MetaTrace (ChainDB.TraceGCEvent blk) where
 instance (ConvertRawHash blk, LedgerSupportsProtocol blk)
   => LogFormatting (ChainDB.TraceInitChainSelEvent blk) where
     forHuman (ChainDB.InitChainSelValidation v) = forHuman v
-    forHuman (ChainDB.InitalChainSelected {}) =
+    forHuman ChainDB.InitalChainSelected{} =
         "Initial chain selected"
-    forHuman (ChainDB.StartedInitChainSelection {}) =
+    forHuman ChainDB.StartedInitChainSelection {} =
         "Started initial chain selection"
 
     forMachine dtal (ChainDB.InitChainSelValidation v) = forMachine dtal v

cardano-node/src/Cardano/Tracing/Startup.hs

@@ -1,28 +1,26 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE UndecidableInstances  #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 module Cardano.Tracing.Startup where
 
-import           Prelude
 import           Data.Text (Text)
+import           Prelude
 
 import           Cardano.Logging (LogFormatting (..))
 import           Cardano.Node.Startup
 import           Cardano.Node.Tracing.Compat
 import           Cardano.Node.Tracing.Tracers.Startup
 import           Cardano.Tracing.OrphanInstances.Network ()
 
-import           Cardano.BM.Tracing (HasPrivacyAnnotation (..),
-                   HasSeverityAnnotation (..), Severity (..), ToObject (..),
-                   Transformable (..))
-import           Cardano.BM.Data.Tracer (HasTextFormatter (..),
-                   trStructuredText)
+import           Cardano.BM.Data.Tracer (HasTextFormatter (..), trStructuredText)
+import           Cardano.BM.Tracing (HasPrivacyAnnotation (..), HasSeverityAnnotation (..),
+                   Severity (..), ToObject (..), Transformable (..))
 
-import           Ouroboros.Consensus.Node.NetworkProtocolVersion
-                   (BlockNodeToClientVersion, BlockNodeToNodeVersion)
+import           Ouroboros.Consensus.Node.NetworkProtocolVersion (BlockNodeToClientVersion,
+                   BlockNodeToNodeVersion)
 
 
 instance HasSeverityAnnotation (StartupTrace blk) where
@@ -43,10 +41,7 @@ instance ( Show (BlockNodeToNodeVersion blk)
       => Transformable Text IO (StartupTrace blk) where
   trTransformer = trStructuredText
 
-instance ( Show (BlockNodeToNodeVersion blk)
-         , Show (BlockNodeToClientVersion blk)
-         )
-        => HasTextFormatter (StartupTrace blk) where
+instance HasTextFormatter (StartupTrace blk) where
   formatText a _ = ppStartupInfoTrace a
 
 instance ( Show (BlockNodeToNodeVersion blk)