Merge pull request #744 from IntersectMBO/mgalazyn/chore/upgrade-four…

…molu-0.18 Nix dev shell: upgrade fourmolu-0.18.0
IntersectMBO · Feb 4, 2025 · 9c62c9c · 9c62c9c
2 parents 505aeae + c068294
commit 9c62c9c
Show file tree

Hide file tree

Showing 16 changed files with 292 additions and 283 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,2 +1,3 @@
 e28fadbebc18b87991f84af72d8611393ae8875a
 b76f949e815990545371530a466b16f691a3aa98
+73fd9122f78282b1db7f6884b3bc23fb29f3e67f
diff --git a/cardano-api/internal/Cardano/Api/Convenience/Query.hs b/cardano-api/internal/Cardano/Api/Convenience/Query.hs
@@ -99,23 +99,23 @@ queryStateForBalancedTx
   -> [TxIn]
   -> [Certificate era]
   -> LocalStateQueryExpr
-      block
-      point
-      QueryInMode
-      r
-      IO
-      ( Either
-          QueryConvenienceError
-          ( UTxO era
-          , LedgerProtocolParameters era
-          , EraHistory
-          , SystemStart
-          , Set PoolId
-          , Map StakeCredential L.Coin
-          , Map (L.Credential L.DRepRole L.StandardCrypto) L.Coin
-          , Maybe (Featured ConwayEraOnwards era TxCurrentTreasuryValue)
-          )
-      )
+       block
+       point
+       QueryInMode
+       r
+       IO
+       ( Either
+           QueryConvenienceError
+           ( UTxO era
+           , LedgerProtocolParameters era
+           , EraHistory
+           , SystemStart
+           , Set PoolId
+           , Map StakeCredential L.Coin
+           , Map (L.Credential L.DRepRole L.StandardCrypto) L.Coin
+           , Maybe (Featured ConwayEraOnwards era TxCurrentTreasuryValue)
+           )
+       )
 queryStateForBalancedTx era allTxIns certs = runExceptT $ do
   sbe <-
     requireShelleyBasedEra era

diff --git a/cardano-api/internal/Cardano/Api/Fees.hs b/cardano-api/internal/Cardano/Api/Fees.hs
@@ -673,8 +673,8 @@ evaluateTransactionExecutionUnits
   -> UTxO era
   -> TxBody era
   -> Either
-      (TransactionValidityError era)
-      (Map ScriptWitnessIndex (Either ScriptExecutionError (EvalTxExecutionUnitsLog, ExecutionUnits)))
+       (TransactionValidityError era)
+       (Map ScriptWitnessIndex (Either ScriptExecutionError (EvalTxExecutionUnitsLog, ExecutionUnits)))
 evaluateTransactionExecutionUnits era systemstart epochInfo pp utxo txbody =
   case makeSignedTransaction' era [] txbody of
     ShelleyTx sbe tx' -> evaluateTransactionExecutionUnitsShelley sbe systemstart epochInfo pp utxo tx'
@@ -689,8 +689,8 @@ evaluateTransactionExecutionUnitsShelley
   -> UTxO era
   -> L.Tx (ShelleyLedgerEra era)
   -> Either
-      (TransactionValidityError era)
-      (Map ScriptWitnessIndex (Either ScriptExecutionError (EvalTxExecutionUnitsLog, ExecutionUnits)))
+       (TransactionValidityError era)
+       (Map ScriptWitnessIndex (Either ScriptExecutionError (EvalTxExecutionUnitsLog, ExecutionUnits)))
 evaluateTransactionExecutionUnitsShelley sbe systemstart epochInfo (LedgerProtocolParameters pp) utxo tx =
   caseShelleyToMaryOrAlonzoEraOnwards
     (const (Right Map.empty))
@@ -707,8 +707,8 @@ evaluateTransactionExecutionUnitsShelley sbe systemstart epochInfo (LedgerProtoc
     :: Alonzo.AlonzoEraScript (ShelleyLedgerEra era)
     => AlonzoEraOnwards era
     -> Map
-        (L.PlutusPurpose L.AsIx (ShelleyLedgerEra era))
-        (Either (L.TransactionScriptFailure (ShelleyLedgerEra era)) (EvalTxExecutionUnitsLog, Alonzo.ExUnits))
+         (L.PlutusPurpose L.AsIx (ShelleyLedgerEra era))
+         (Either (L.TransactionScriptFailure (ShelleyLedgerEra era)) (EvalTxExecutionUnitsLog, Alonzo.ExUnits))
     -> Map ScriptWitnessIndex (Either ScriptExecutionError (EvalTxExecutionUnitsLog, ExecutionUnits))
   fromLedgerScriptExUnitsMap aOnwards exmap =
     fromList
@@ -1502,15 +1502,15 @@ substituteExecutionUnits
       let mappedScriptWitnesses
             :: [ ( Certificate era
                  , Either
-                    (TxBodyErrorAutoBalance era)
-                    ( BuildTxWith
-                        BuildTx
-                        ( Maybe
-                            ( StakeCredential
-                            , Witness WitCtxStake era
-                            )
-                        )
-                    )
+                     (TxBodyErrorAutoBalance era)
+                     ( BuildTxWith
+                         BuildTx
+                         ( Maybe
+                             ( StakeCredential
+                             , Witness WitCtxStake era
+                             )
+                         )
+                     )
                  )
                ]
           mappedScriptWitnesses =
@@ -1523,8 +1523,8 @@ substituteExecutionUnits
     mapScriptWitnessesVotes
       :: Maybe (Featured ConwayEraOnwards era (TxVotingProcedures build era))
       -> Either
-          (TxBodyErrorAutoBalance era)
-          (Maybe (Featured ConwayEraOnwards era (TxVotingProcedures build era)))
+           (TxBodyErrorAutoBalance era)
+           (Maybe (Featured ConwayEraOnwards era (TxVotingProcedures build era)))
     mapScriptWitnessesVotes Nothing = return Nothing
     mapScriptWitnessesVotes (Just (Featured _ TxVotingProceduresNone)) = return Nothing
     mapScriptWitnessesVotes (Just (Featured _ (TxVotingProcedures _ ViewTx))) = return Nothing
@@ -1544,8 +1544,8 @@ substituteExecutionUnits
     mapScriptWitnessesProposals
       :: Maybe (Featured ConwayEraOnwards era (TxProposalProcedures build era))
       -> Either
-          (TxBodyErrorAutoBalance era)
-          (Maybe (Featured ConwayEraOnwards era (TxProposalProcedures build era)))
+           (TxBodyErrorAutoBalance era)
+           (Maybe (Featured ConwayEraOnwards era (TxProposalProcedures build era)))
     mapScriptWitnessesProposals Nothing = return Nothing
     mapScriptWitnessesProposals (Just (Featured _ TxProposalProceduresNone)) = return Nothing
     mapScriptWitnessesProposals (Just (Featured _ (TxProposalProcedures _ ViewTx))) = return Nothing

diff --git a/cardano-api/internal/Cardano/Api/IPC.hs b/cardano-api/internal/Cardano/Api/IPC.hs
@@ -237,16 +237,16 @@ mkVersionedProtocols
   -> ProtocolClientInfoArgs block
   -> (NodeToClientVersion -> LocalNodeClientProtocolsForBlock block)
   -> Net.Versions
-      Net.NodeToClientVersion
-      Net.NodeToClientVersionData
-      ( Net.OuroborosApplicationWithMinimalCtx
-          Net.InitiatorMode
-          Net.LocalAddress
-          LBS.ByteString
-          IO
-          ()
-          Void
-      )
+       Net.NodeToClientVersion
+       Net.NodeToClientVersionData
+       ( Net.OuroborosApplicationWithMinimalCtx
+           Net.InitiatorMode
+           Net.LocalAddress
+           LBS.ByteString
+           IO
+           ()
+           Void
+       )
 mkVersionedProtocols networkid ptcl unversionedClients =
   -- TODO: really we should construct specific combinations of
   -- protocols for the versions we know about, with different protocol
@@ -357,10 +357,10 @@ data LocalNodeClientParams where
   LocalNodeClientParamsSingleBlock
     :: ( ProtocolClient block
        , Consensus.LedgerSupportsProtocol
-          ( Consensus.ShelleyBlock
-              (Consensus.TPraos Consensus.StandardCrypto)
-              (Consensus.ShelleyEra Consensus.StandardCrypto)
-          )
+           ( Consensus.ShelleyBlock
+               (Consensus.TPraos Consensus.StandardCrypto)
+               (Consensus.ShelleyEra Consensus.StandardCrypto)
+           )
        )
     => ProtocolClientInfoArgs block
     -> (NodeToClientVersion -> LocalNodeClientProtocolsForBlock block)
@@ -375,36 +375,36 @@ data LocalNodeClientProtocolsForBlock block
   = LocalNodeClientProtocolsForBlock
   { localChainSyncClientForBlock
       :: LocalChainSyncClient
-          block
-          (Consensus.Point block)
-          (Net.Tip block)
-          IO
+           block
+           (Consensus.Point block)
+           (Net.Tip block)
+           IO
   , localStateQueryClientForBlock
       :: Maybe
-          ( LocalStateQueryClient
-              block
-              (Consensus.Point block)
-              (Consensus.Query block)
-              IO
-              ()
-          )
+           ( LocalStateQueryClient
+               block
+               (Consensus.Point block)
+               (Consensus.Query block)
+               IO
+               ()
+           )
   , localTxSubmissionClientForBlock
       :: Maybe
-          ( LocalTxSubmissionClient
-              (Consensus.GenTx block)
-              (Consensus.ApplyTxErr block)
-              IO
-              ()
-          )
+           ( LocalTxSubmissionClient
+               (Consensus.GenTx block)
+               (Consensus.ApplyTxErr block)
+               IO
+               ()
+           )
   , localTxMonitoringClientForBlock
       :: Maybe
-          ( LocalTxMonitorClient
-              (Consensus.TxId (Consensus.GenTx block))
-              (Consensus.GenTx block)
-              SlotNo
-              IO
-              ()
-          )
+           ( LocalTxMonitorClient
+               (Consensus.TxId (Consensus.GenTx block))
+               (Consensus.GenTx block)
+               SlotNo
+               IO
+               ()
+           )
   }
 
 -- | Convert from the mode-parametrised style to the block-parametrised style.

diff --git a/cardano-api/internal/Cardano/Api/LedgerEvents/LedgerEvent.hs b/cardano-api/internal/Cardano/Api/LedgerEvents/LedgerEvent.hs
@@ -110,8 +110,8 @@ data PoolReapDetails = PoolReapDetails
 
 convertRetiredPoolsMap
   :: Map
-      (Ledger.StakeCredential StandardCrypto)
-      (Map (Ledger.KeyHash Ledger.StakePool StandardCrypto) Ledger.Coin)
+       (Ledger.StakeCredential StandardCrypto)
+       (Map (Ledger.KeyHash Ledger.StakePool StandardCrypto) Ledger.Coin)
   -> Map StakeCredential (Map (Hash StakePoolKey) L.Coin)
 convertRetiredPoolsMap =
   Map.mapKeys fromShelleyStakeCredential