Merge pull request #1049 from IntersectMBO/mgalazyn/chore/upgrade-fou…

…rmolu-0.18 Nix dev shell: upgrade fourmolu-0.18.0
IntersectMBO · Feb 4, 2025 · 2427f53 · 2427f53
2 parents 867b295 + db53aaa
commit 2427f53
Show file tree

Hide file tree

Showing 13 changed files with 144 additions and 122 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1 +1,3 @@
 9d1fd093071278be77428dba189d958d5b7a7aeb
+ddeefdf97d635634083ea286af05c1026d4bc28b
+cdd0ead52f740eca8cedb152307992a11c6b478a
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs
@@ -76,10 +76,10 @@ data GovernanceDRepUpdateCertificateCmdArgs era
   , drepHashSource :: !DRepHashSource
   , mAnchor
       :: Maybe
-          ( PotentiallyCheckedAnchor
-              DRepMetadataUrl
-              (L.Anchor L.StandardCrypto)
-          )
+           ( PotentiallyCheckedAnchor
+               DRepMetadataUrl
+               (L.Anchor L.StandardCrypto)
+           )
   , outFile :: !(File () Out)
   }
 

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -1102,10 +1102,10 @@ pScriptWitnessFiles witctx autoBalanceExecUnits scriptFlagPrefix scriptFlagPrefi
   toScriptWitnessFiles
     :: ScriptFile
     -> Maybe
-        ( ScriptDatumOrFile witctx
-        , ScriptRedeemerOrFile
-        , ExecutionUnits
-        )
+         ( ScriptDatumOrFile witctx
+         , ScriptRedeemerOrFile
+         , ExecutionUnits
+         )
     -> ScriptWitnessFiles witctx
   toScriptWitnessFiles sf Nothing = SimpleScriptWitnessFile sf
   toScriptWitnessFiles sf (Just (d, r, e)) = PlutusScriptWitnessFiles sf d r e
@@ -1581,10 +1581,10 @@ pMetadataFile =
 pWithdrawal
   :: BalanceTxExecUnits
   -> Parser
-      ( StakeAddress
-      , Lovelace
-      , Maybe (ScriptWitnessFiles WitCtxStake)
-      )
+       ( StakeAddress
+       , Lovelace
+       , Maybe (ScriptWitnessFiles WitCtxStake)
+       )
 pWithdrawal balance =
   (\(stakeAddr, lovelace) maybeScriptFp -> (stakeAddr, lovelace, maybeScriptFp))
     <$> Opt.option

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs
@@ -309,13 +309,13 @@ generateShelleyNodeSecrets
   :: [SigningKey GenesisDelegateExtendedKey]
   -> [VerificationKey GenesisKey]
   -> IO
-      ( Map
-          (Hash GenesisKey)
-          (Hash GenesisDelegateKey, Hash VrfKey)
-      , [SigningKey VrfKey]
-      , [SigningKey KesKey]
-      , [(OperationalCertificate, OperationalCertificateIssueCounter)]
-      )
+       ( Map
+           (Hash GenesisKey)
+           (Hash GenesisDelegateKey, Hash VrfKey)
+       , [SigningKey VrfKey]
+       , [SigningKey KesKey]
+       , [(OperationalCertificate, OperationalCertificateIssueCounter)]
+       )
 generateShelleyNodeSecrets shelleyDelegateKeys shelleyGenesisvkeys = do
   let
     shelleyDelegatevkeys :: [VerificationKey GenesisDelegateKey]
@@ -711,17 +711,17 @@ runGenesisCreateStakedCmd
           , " delegation map entries, "
           ]
             ++ [ mconcat
-                  [ ", "
-                  , textShow numBulkPoolCredFiles
-                  , " bulk pool credential files, "
-                  , textShow numBulkPoolsPerFile
-                  , " pools per bulk credential file, indices starting from "
-                  , textShow bulkOffset
-                  , ", "
-                  , textShow $ length bulkIndices
-                  , " total pools in bulk nodes, each bulk node having this many entries: "
-                  , textShow $ length <$> bulkSlices
-                  ]
+                   [ ", "
+                   , textShow numBulkPoolCredFiles
+                   , " bulk pool credential files, "
+                   , textShow numBulkPoolsPerFile
+                   , " pools per bulk credential file, indices starting from "
+                   , textShow bulkOffset
+                   , ", "
+                   , textShow $ length bulkIndices
+                   , " total pools in bulk nodes, each bulk node having this many entries: "
+                   , textShow $ length <$> bulkSlices
+                   ]
                | numBulkPoolCredFiles * numBulkPoolsPerFile > 0
                ]
    where
@@ -983,9 +983,9 @@ writeBulkPoolCredentials dir bulkIx poolIxs = do
   readPoolCreds
     :: Word
     -> ExceptT
-        GenesisCmdError
-        IO
-        (TextEnvelope, TextEnvelope, TextEnvelope)
+         GenesisCmdError
+         IO
+         (TextEnvelope, TextEnvelope, TextEnvelope)
   readPoolCreds ix = do
     (,,)
       <$> readEnvelope poolOpCert
@@ -1158,25 +1158,25 @@ readGenDelegsMap
   :: FilePath
   -> FilePath
   -> ExceptT
-      GenesisCmdError
-      IO
-      ( Map
-          (Hash GenesisKey)
-          (Hash GenesisDelegateKey, Hash VrfKey)
-      )
+       GenesisCmdError
+       IO
+       ( Map
+           (Hash GenesisKey)
+           (Hash GenesisDelegateKey, Hash VrfKey)
+       )
 readGenDelegsMap gendir deldir = do
   gkm <- readGenesisKeys gendir
   dkm <- readDelegateKeys deldir
   vkm <- readDelegateVrfKeys deldir
 
   let combinedMap
         :: Map
-            Int
-            ( VerificationKey GenesisKey
-            , ( VerificationKey GenesisDelegateKey
-              , VerificationKey VrfKey
-              )
-            )
+             Int
+             ( VerificationKey GenesisKey
+             , ( VerificationKey GenesisDelegateKey
+               , VerificationKey VrfKey
+               )
+             )
       combinedMap =
         Map.intersectionWith
           (,)
@@ -1200,8 +1200,8 @@ readGenDelegsMap gendir deldir = do
 
   let delegsMap
         :: Map
-            (Hash GenesisKey)
-            (Hash GenesisDelegateKey, Hash VrfKey)
+             (Hash GenesisKey)
+             (Hash GenesisDelegateKey, Hash VrfKey)
       delegsMap =
         fromList
           [ (gh, (dh, vh))
@@ -1216,9 +1216,9 @@ readGenDelegsMap gendir deldir = do
 readGenesisKeys
   :: FilePath
   -> ExceptT
-      GenesisCmdError
-      IO
-      (Map Int (VerificationKey GenesisKey))
+       GenesisCmdError
+       IO
+       (Map Int (VerificationKey GenesisKey))
 readGenesisKeys gendir = do
   files <- liftIO (listDirectory gendir)
   fileIxs <-
@@ -1241,9 +1241,9 @@ readGenesisKeys gendir = do
 readDelegateKeys
   :: FilePath
   -> ExceptT
-      GenesisCmdError
-      IO
-      (Map Int (VerificationKey GenesisDelegateKey))
+       GenesisCmdError
+       IO
+       (Map Int (VerificationKey GenesisDelegateKey))
 readDelegateKeys deldir = do
   files <- liftIO (listDirectory deldir)
   fileIxs <-
@@ -1266,9 +1266,9 @@ readDelegateKeys deldir = do
 readDelegateVrfKeys
   :: FilePath
   -> ExceptT
-      GenesisCmdError
-      IO
-      (Map Int (VerificationKey VrfKey))
+       GenesisCmdError
+       IO
+       (Map Int (VerificationKey VrfKey))
 readDelegateVrfKeys deldir = do
   files <- liftIO (listDirectory deldir)
   fileIxs <-

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs
@@ -8,7 +8,6 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE NumericUnderscores #-}
-{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
@@ -645,11 +644,11 @@ createGenesisKeys dir = do
 createStakeDelegatorCredentials
   :: FilePath
   -> ExceptT
-      GenesisCmdError
-      IO
-      ( VerificationKey PaymentKey
-      , VerificationKey StakeKey
-      )
+       GenesisCmdError
+       IO
+       ( VerificationKey PaymentKey
+       , VerificationKey StakeKey
+       )
 createStakeDelegatorCredentials dir = do
   liftIO $ createDirectoryIfMissing True dir
   (pvk, _psk) <-
@@ -901,25 +900,25 @@ readGenDelegsMap
   -> Map Int FilePath
   -> Map Int FilePath
   -> ExceptT
-      GenesisCmdError
-      IO
-      ( Map
-          (Hash GenesisKey)
-          (Hash GenesisDelegateKey, Hash VrfKey)
-      )
+       GenesisCmdError
+       IO
+       ( Map
+           (Hash GenesisKey)
+           (Hash GenesisDelegateKey, Hash VrfKey)
+       )
 readGenDelegsMap genesisKeys delegateKeys delegateVrfKeys = do
   gkm <- readKeys (AsVerificationKey AsGenesisKey) genesisKeys
   dkm <- readKeys (AsVerificationKey AsGenesisDelegateKey) delegateKeys
   vkm <- readKeys (AsVerificationKey AsVrfKey) delegateVrfKeys
 
   let combinedMap
         :: Map
-            Int
-            ( VerificationKey GenesisKey
-            , ( VerificationKey GenesisDelegateKey
-              , VerificationKey VrfKey
-              )
-            )
+             Int
+             ( VerificationKey GenesisKey
+             , ( VerificationKey GenesisDelegateKey
+               , VerificationKey VrfKey
+               )
+             )
       combinedMap =
         Map.intersectionWith
           (,)
@@ -939,8 +938,8 @@ readGenDelegsMap genesisKeys delegateKeys delegateVrfKeys = do
 
   let delegsMap
         :: Map
-            (Hash GenesisKey)
-            (Hash GenesisDelegateKey, Hash VrfKey)
+             (Hash GenesisKey)
+             (Hash GenesisDelegateKey, Hash VrfKey)
       delegsMap =
         fromList
           [ (gh, (dh, vh))

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs
@@ -1671,8 +1671,8 @@ runQuerySPOStakeDistribution
 
     let addressesAndRewards
           :: Map
-              StakeAddress
-              (L.KeyHash L.StakePool StandardCrypto) =
+               StakeAddress
+               (L.KeyHash L.StakePool StandardCrypto) =
             Map.fromList
               [ ( makeStakeAddress networkId . fromShelleyStakeCredential . L.raCredential . L.ppRewardAccount $ addr
                 , keyHash
@@ -1792,15 +1792,15 @@ runQuery
   :: LocalNodeConnectInfo
   -> Consensus.Target ChainPoint
   -> LocalStateQueryExpr
-      BlockInMode
-      ChainPoint
-      QueryInMode
-      ()
-      IO
-      ( Either
-          UnsupportedNtcVersionError
-          (Either Consensus.EraMismatch a)
-      )
+       BlockInMode
+       ChainPoint
+       QueryInMode
+       ()
+       IO
+       ( Either
+           UnsupportedNtcVersionError
+           (Either Consensus.EraMismatch a)
+       )
   -> ExceptT QueryCmdError IO a
 runQuery localNodeConnInfo target query =
   firstExceptT

diff --git a/cardano-cli/src/Cardano/CLI/Run/Node.hs b/cardano-cli/src/Cardano/CLI/Run/Node.hs
@@ -282,11 +282,11 @@ runNodeIssueOpCertCmd
 
     textEnvPossibleBlockIssuers
       :: [ FromSomeType
-            HasTextEnvelope
-            ( Either
-                (SigningKey StakePoolKey)
-                (SigningKey GenesisDelegateExtendedKey)
-            )
+             HasTextEnvelope
+             ( Either
+                 (SigningKey StakePoolKey)
+                 (SigningKey GenesisDelegateExtendedKey)
+             )
          ]
     textEnvPossibleBlockIssuers =
       [ FromSomeType (AsSigningKey AsStakePoolKey) Left
@@ -296,11 +296,11 @@ runNodeIssueOpCertCmd
 
     bech32PossibleBlockIssuers
       :: [ FromSomeType
-            SerialiseAsBech32
-            ( Either
-                (SigningKey StakePoolKey)
-                (SigningKey GenesisDelegateExtendedKey)
-            )
+             SerialiseAsBech32
+             ( Either
+                 (SigningKey StakePoolKey)
+                 (SigningKey GenesisDelegateExtendedKey)
+             )
          ]
     bech32PossibleBlockIssuers =
       [FromSomeType (AsSigningKey AsStakePoolKey) Left]

diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs
@@ -100,8 +100,8 @@ validateTxCurrentTreasuryValue
   => ShelleyBasedEra era
   -> Maybe TxCurrentTreasuryValue
   -> Either
-      (TxNotSupportedInEraValidationError era)
-      (Maybe (Featured ConwayEraOnwards era (Maybe Lovelace)))
+       (TxNotSupportedInEraValidationError era)
+       (Maybe (Featured ConwayEraOnwards era (Maybe Lovelace)))
 validateTxCurrentTreasuryValue sbe mCurrentTreasuryValue =
   case mCurrentTreasuryValue of
     Nothing -> Right Nothing
@@ -195,8 +195,8 @@ validateUpdateProposalFile
   :: CardanoEra era
   -> Maybe UpdateProposalFile
   -> Either
-      (TxNotSupportedInEraValidationError era)
-      (Maybe (Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile)))
+       (TxNotSupportedInEraValidationError era)
+       (Maybe (Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile)))
 validateUpdateProposalFile era = \case
   Nothing -> pure Nothing
   Just updateProposal -> do

diff --git a/cardano-cli/src/Cardano/CLI/Types/Output.hs b/cardano-cli/src/Cardano/CLI/Types/Output.hs
@@ -195,8 +195,8 @@ instance ToJSON QueryDRepStateOutput where
           , "deposit" .= deposit
           ]
             <> ( case includeStake of
-                  WithStake -> ["stake" .= stake]
-                  NoStake -> []
+                   WithStake -> ["stake" .= stake]
+                   NoStake -> []
                )
       )
 

diff --git a/flake.lock b/flake.lock