Updated cardano-node for 1.35.5 releasefixed

* fixed formatting
IntersectMBO · Feb 6, 2023 · b5640c2 · b5640c2
1 parent 0e8d611
commit b5640c2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/cardano-api/src/Cardano/Api/Fees.hs b/cardano-api/src/Cardano/Api/Fees.hs
@@ -60,6 +60,8 @@ import           Numeric.Natural
 import qualified Prettyprinter as PP
 import qualified Prettyprinter.Render.String as PP
 
+import           Lens.Micro ((^.))
+
 import qualified Cardano.Binary as CBOR
 import qualified Cardano.Ledger.BaseTypes as Ledger
 
@@ -68,6 +70,7 @@ import qualified Cardano.Chain.Common as Byron
 import qualified Cardano.Ledger.Coin as Ledger
 import           Cardano.Ledger.Core (EraTx (sizeTxF))
 import qualified Cardano.Ledger.Core as Ledger
+import           Cardano.Ledger.Core (EraTx(sizeTxF))
 import qualified Cardano.Ledger.Crypto as Ledger
 import qualified Cardano.Ledger.Era as Ledger.Era (Crypto)
 import qualified Cardano.Ledger.Keys as Ledger
@@ -79,6 +82,9 @@ import qualified Cardano.Ledger.Shelley.API.Wallet as Ledger (evaluateTransactio
                    evaluateTransactionFee)
 import qualified Cardano.Ledger.Shelley.API.Wallet as Shelley
 import           Cardano.Ledger.Shelley.PParams (ShelleyPParamsHKD (..))
+import           Cardano.Ledger.Shelley.TxBody (ShelleyEraTxBody)
+
+import           Cardano.Ledger.Mary.Value (MaryValue)
 
 import qualified Cardano.Ledger.Alonzo as Alonzo
 import qualified Cardano.Ledger.Alonzo.Language as Alonzo
@@ -108,10 +114,6 @@ import           Cardano.Api.Script
 import           Cardano.Api.Tx
 import           Cardano.Api.TxBody
 import           Cardano.Api.Value
-import Lens.Micro ((^.))
-import Cardano.Ledger.Core (EraTx(sizeTxF))
-import Cardano.Ledger.Shelley.TxBody (ShelleyEraTxBody)
-import Cardano.Ledger.Mary.Value (MaryValue)
 
 {- HLINT ignore "Redundant return" -}
 

diff --git a/cardano-api/src/Cardano/Api/LedgerEvent.hs b/cardano-api/src/Cardano/Api/LedgerEvent.hs
@@ -50,12 +50,6 @@ import           Ouroboros.Consensus.Ledger.Basics (AuxLedgerEvent)
 import           Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock,
                    ShelleyLedgerEvent (ShelleyLedgerEventTICK))
 import           Ouroboros.Consensus.TypeFamilyWrappers
-import Cardano.Ledger.Shelley.Rules.Tick (ShelleyTickEvent (NewEpochEvent))
-import Cardano.Ledger.Shelley.Rules.NewEpoch (ShelleyNewEpochEvent (..))
-import Cardano.Ledger.Shelley.Rules.Epoch (ShelleyEpochEvent (..))
-import Cardano.Ledger.Shelley.Rules.PoolReap (ShelleyPoolreapEvent (..))
-import Cardano.Ledger.Shelley.Rules.Mir (ShelleyMirEvent (..))
-import Cardano.Ledger.Shelley.Rules.Rupd (RupdEvent (..))
 
 data LedgerEvent
   = -- | The given pool is being registered for the first time on chain.

diff --git a/cardano-api/src/Cardano/Api/LedgerState.hs b/cardano-api/src/Cardano/Api/LedgerState.hs
@@ -1315,7 +1315,8 @@ instance Error LeadershipError where
 nextEpochEligibleLeadershipSlots
   :: forall era.
      ( HasField "_d" (Core.PParams (ShelleyLedgerEra era)) UnitInterval
-     , HashAnnotated (Core.TxBody (ShelleyLedgerEra era)) Core.EraIndependentTxBody (Ledger.Crypto (ShelleyLedgerEra era)))
+     , HashAnnotated (Core.TxBody (ShelleyLedgerEra era)) Core.EraIndependentTxBody (Ledger.Crypto (ShelleyLedgerEra era))
+     )
   => Ledger.Era (ShelleyLedgerEra era)
   => Share (Core.TxOut (ShelleyLedgerEra era)) ~ Interns (Shelley.Spec.Credential 'Shelley.Spec.Staking (Cardano.Ledger.Era.Crypto (ShelleyLedgerEra era)))
   => FromCBOR (Consensus.ChainDepState (Api.ConsensusProtocol era))

diff --git a/cardano-api/src/Cardano/Api/Orphans.hs b/cardano-api/src/Cardano/Api/Orphans.hs
@@ -52,6 +52,7 @@ import qualified Cardano.Ledger.Babbage.TxBody as Babbage
 import qualified Cardano.Ledger.Coin as Shelley
 import           Cardano.Ledger.Core (EraTxOut)
 import qualified Cardano.Ledger.Core as Core
+import           Cardano.Ledger.Core (EraTxOut)
 import qualified Cardano.Ledger.Crypto as Crypto
 import qualified Cardano.Ledger.PoolDistr as Ledger
 import qualified Cardano.Ledger.SafeHash as SafeHash
@@ -71,15 +72,6 @@ import           Cardano.Ledger.Babbage.TxBody (BabbageTxOut(..))
 import qualified Ouroboros.Consensus.Shelley.Eras as Consensus
 import qualified Ouroboros.Consensus.Shelley.Ledger.Query as Consensus
 
-import           Cardano.Api.Script
-import Cardano.Ledger.Mary.Value (MaryValue(..))
-import Cardano.Ledger.Babbage.TxBody (BabbageTxOut(..))
-import Cardano.Ledger.Shelley.API (ShelleyTxOut(..))
-import Cardano.Ledger.Val (Val)
-import Cardano.Ledger.Core (EraTxOut)
-import Cardano.Ledger.Babbage.PParams (BabbagePParamsUpdate, BabbagePParams)
-import Cardano.Ledger.Alonzo.Scripts (AlonzoScript)
-
 -- Orphan instances involved in the JSON output of the API queries.
 -- We will remove/replace these as we provide more API wrapper types
 
@@ -223,7 +215,8 @@ instance ( ToJSON (Core.PParamsUpdate era)
 toPpupStatePairs ::
   ( Aeson.KeyValue a
   , ToJSON (Core.PParamsUpdate era)
-  , Core.Era era) => ShelleyLedger.PPUPState era -> [a]
+  , Core.Era era
+  ) => ShelleyLedger.PPUPState era -> [a]
 toPpupStatePairs ppUpState =
   let !proposals = Shelley.proposals ppUpState
       !futureProposals = Shelley.futureProposals ppUpState

diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
@@ -42,6 +42,8 @@ import           Cardano.Node.Tracing.Formatting ()
 import           Cardano.Node.Tracing.Render
 import           Cardano.Node.Tracing.Tracers.ConsensusStartupException ()
 import           Cardano.Node.Tracing.Tracers.StartLeadershipCheck
+import           Cardano.Node.Tracing.Tracers.ForgingThreadStats(ForgingStats)
+import           Cardano.Node.Tracing.Tracers.ConsensusStartupException
 import           Cardano.Prelude hiding (All, Show, show)
 
 import           Cardano.Protocol.TPraos.OCert (KESPeriod (..))