Skip to content

Commit 2427f53

Browse files
carbolymercarbolymer
authored
Merge pull request #1049 from IntersectMBO/mgalazyn/chore/upgrade-fourmolu-0.18
 Nix dev shell: upgrade fourmolu-0.18.0
2 parents 867b295 + db53aaa commit 2427f53

File tree

13 files changed

+144
-122
lines changed

13 files changed

+144
-122
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
9d1fd093071278be77428dba189d958d5b7a7aeb
2+
ddeefdf97d635634083ea286af05c1026d4bc28b
3+
cdd0ead52f740eca8cedb152307992a11c6b478a

‎cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ data GovernanceDRepUpdateCertificateCmdArgs era
7676
, drepHashSource :: !DRepHashSource
7777
, mAnchor
7878
:: Maybe
79-
( PotentiallyCheckedAnchor
80-
DRepMetadataUrl
81-
(L.Anchor L.StandardCrypto)
82-
)
79+
( PotentiallyCheckedAnchor
80+
DRepMetadataUrl
81+
(L.Anchor L.StandardCrypto)
82+
)
8383
, outFile :: !(File () Out)
8484
}
8585

‎cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,10 +1102,10 @@ pScriptWitnessFiles witctx autoBalanceExecUnits scriptFlagPrefix scriptFlagPrefi
11021102
toScriptWitnessFiles
11031103
:: ScriptFile
11041104
-> Maybe
1105-
( ScriptDatumOrFile witctx
1106-
, ScriptRedeemerOrFile
1107-
, ExecutionUnits
1108-
)
1105+
( ScriptDatumOrFile witctx
1106+
, ScriptRedeemerOrFile
1107+
, ExecutionUnits
1108+
)
11091109
-> ScriptWitnessFiles witctx
11101110
toScriptWitnessFiles sf Nothing = SimpleScriptWitnessFile sf
11111111
toScriptWitnessFiles sf (Just (d, r, e)) = PlutusScriptWitnessFiles sf d r e
@@ -1581,10 +1581,10 @@ pMetadataFile =
15811581
pWithdrawal
15821582
:: BalanceTxExecUnits
15831583
-> Parser
1584-
( StakeAddress
1585-
, Lovelace
1586-
, Maybe (ScriptWitnessFiles WitCtxStake)
1587-
)
1584+
( StakeAddress
1585+
, Lovelace
1586+
, Maybe (ScriptWitnessFiles WitCtxStake)
1587+
)
15881588
pWithdrawal balance =
15891589
(\(stakeAddr, lovelace) maybeScriptFp -> (stakeAddr, lovelace, maybeScriptFp))
15901590
<$> Opt.option

‎cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,13 @@ generateShelleyNodeSecrets
309309
:: [SigningKey GenesisDelegateExtendedKey]
310310
-> [VerificationKey GenesisKey]
311311
-> IO
312-
( Map
313-
(Hash GenesisKey)
314-
(Hash GenesisDelegateKey, Hash VrfKey)
315-
, [SigningKey VrfKey]
316-
, [SigningKey KesKey]
317-
, [(OperationalCertificate, OperationalCertificateIssueCounter)]
318-
)
312+
( Map
313+
(Hash GenesisKey)
314+
(Hash GenesisDelegateKey, Hash VrfKey)
315+
, [SigningKey VrfKey]
316+
, [SigningKey KesKey]
317+
, [(OperationalCertificate, OperationalCertificateIssueCounter)]
318+
)
319319
generateShelleyNodeSecrets shelleyDelegateKeys shelleyGenesisvkeys = do
320320
let
321321
shelleyDelegatevkeys :: [VerificationKey GenesisDelegateKey]
@@ -711,17 +711,17 @@ runGenesisCreateStakedCmd
711711
, " delegation map entries, "
712712
]
713713
++ [ mconcat
714-
[ ", "
715-
, textShow numBulkPoolCredFiles
716-
, " bulk pool credential files, "
717-
, textShow numBulkPoolsPerFile
718-
, " pools per bulk credential file, indices starting from "
719-
, textShow bulkOffset
720-
, ", "
721-
, textShow $ length bulkIndices
722-
, " total pools in bulk nodes, each bulk node having this many entries: "
723-
, textShow $ length <$> bulkSlices
724-
]
714+
[ ", "
715+
, textShow numBulkPoolCredFiles
716+
, " bulk pool credential files, "
717+
, textShow numBulkPoolsPerFile
718+
, " pools per bulk credential file, indices starting from "
719+
, textShow bulkOffset
720+
, ", "
721+
, textShow $ length bulkIndices
722+
, " total pools in bulk nodes, each bulk node having this many entries: "
723+
, textShow $ length <$> bulkSlices
724+
]
725725
| numBulkPoolCredFiles * numBulkPoolsPerFile > 0
726726
]
727727
where
@@ -983,9 +983,9 @@ writeBulkPoolCredentials dir bulkIx poolIxs = do
983983
readPoolCreds
984984
:: Word
985985
-> ExceptT
986-
GenesisCmdError
987-
IO
988-
(TextEnvelope, TextEnvelope, TextEnvelope)
986+
GenesisCmdError
987+
IO
988+
(TextEnvelope, TextEnvelope, TextEnvelope)
989989
readPoolCreds ix = do
990990
(,,)
991991
<$> readEnvelope poolOpCert
@@ -1158,25 +1158,25 @@ readGenDelegsMap
11581158
:: FilePath
11591159
-> FilePath
11601160
-> ExceptT
1161-
GenesisCmdError
1162-
IO
1163-
( Map
1164-
(Hash GenesisKey)
1165-
(Hash GenesisDelegateKey, Hash VrfKey)
1166-
)
1161+
GenesisCmdError
1162+
IO
1163+
( Map
1164+
(Hash GenesisKey)
1165+
(Hash GenesisDelegateKey, Hash VrfKey)
1166+
)
11671167
readGenDelegsMap gendir deldir = do
11681168
gkm <- readGenesisKeys gendir
11691169
dkm <- readDelegateKeys deldir
11701170
vkm <- readDelegateVrfKeys deldir
11711171

11721172
let combinedMap
11731173
:: Map
1174-
Int
1175-
( VerificationKey GenesisKey
1176-
, ( VerificationKey GenesisDelegateKey
1177-
, VerificationKey VrfKey
1178-
)
1179-
)
1174+
Int
1175+
( VerificationKey GenesisKey
1176+
, ( VerificationKey GenesisDelegateKey
1177+
, VerificationKey VrfKey
1178+
)
1179+
)
11801180
combinedMap =
11811181
Map.intersectionWith
11821182
(,)
@@ -1200,8 +1200,8 @@ readGenDelegsMap gendir deldir = do
12001200

12011201
let delegsMap
12021202
:: Map
1203-
(Hash GenesisKey)
1204-
(Hash GenesisDelegateKey, Hash VrfKey)
1203+
(Hash GenesisKey)
1204+
(Hash GenesisDelegateKey, Hash VrfKey)
12051205
delegsMap =
12061206
fromList
12071207
[ (gh, (dh, vh))
@@ -1216,9 +1216,9 @@ readGenDelegsMap gendir deldir = do
12161216
readGenesisKeys
12171217
:: FilePath
12181218
-> ExceptT
1219-
GenesisCmdError
1220-
IO
1221-
(Map Int (VerificationKey GenesisKey))
1219+
GenesisCmdError
1220+
IO
1221+
(Map Int (VerificationKey GenesisKey))
12221222
readGenesisKeys gendir = do
12231223
files <- liftIO (listDirectory gendir)
12241224
fileIxs <-
@@ -1241,9 +1241,9 @@ readGenesisKeys gendir = do
12411241
readDelegateKeys
12421242
:: FilePath
12431243
-> ExceptT
1244-
GenesisCmdError
1245-
IO
1246-
(Map Int (VerificationKey GenesisDelegateKey))
1244+
GenesisCmdError
1245+
IO
1246+
(Map Int (VerificationKey GenesisDelegateKey))
12471247
readDelegateKeys deldir = do
12481248
files <- liftIO (listDirectory deldir)
12491249
fileIxs <-
@@ -1266,9 +1266,9 @@ readDelegateKeys deldir = do
12661266
readDelegateVrfKeys
12671267
:: FilePath
12681268
-> ExceptT
1269-
GenesisCmdError
1270-
IO
1271-
(Map Int (VerificationKey VrfKey))
1269+
GenesisCmdError
1270+
IO
1271+
(Map Int (VerificationKey VrfKey))
12721272
readDelegateVrfKeys deldir = do
12731273
files <- liftIO (listDirectory deldir)
12741274
fileIxs <-

‎cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
{-# LANGUAGE GADTs #-}
99
{-# LANGUAGE NamedFieldPuns #-}
1010
{-# LANGUAGE NumericUnderscores #-}
11-
{-# LANGUAGE RecordWildCards #-}
1211
{-# LANGUAGE ScopedTypeVariables #-}
1312
{-# LANGUAGE TupleSections #-}
1413
{-# LANGUAGE TypeApplications #-}
@@ -645,11 +644,11 @@ createGenesisKeys dir = do
645644
createStakeDelegatorCredentials
646645
:: FilePath
647646
-> ExceptT
648-
GenesisCmdError
649-
IO
650-
( VerificationKey PaymentKey
651-
, VerificationKey StakeKey
652-
)
647+
GenesisCmdError
648+
IO
649+
( VerificationKey PaymentKey
650+
, VerificationKey StakeKey
651+
)
653652
createStakeDelegatorCredentials dir = do
654653
liftIO $ createDirectoryIfMissing True dir
655654
(pvk, _psk) <-
@@ -901,25 +900,25 @@ readGenDelegsMap
901900
-> Map Int FilePath
902901
-> Map Int FilePath
903902
-> ExceptT
904-
GenesisCmdError
905-
IO
906-
( Map
907-
(Hash GenesisKey)
908-
(Hash GenesisDelegateKey, Hash VrfKey)
909-
)
903+
GenesisCmdError
904+
IO
905+
( Map
906+
(Hash GenesisKey)
907+
(Hash GenesisDelegateKey, Hash VrfKey)
908+
)
910909
readGenDelegsMap genesisKeys delegateKeys delegateVrfKeys = do
911910
gkm <- readKeys (AsVerificationKey AsGenesisKey) genesisKeys
912911
dkm <- readKeys (AsVerificationKey AsGenesisDelegateKey) delegateKeys
913912
vkm <- readKeys (AsVerificationKey AsVrfKey) delegateVrfKeys
914913

915914
let combinedMap
916915
:: Map
917-
Int
918-
( VerificationKey GenesisKey
919-
, ( VerificationKey GenesisDelegateKey
920-
, VerificationKey VrfKey
921-
)
922-
)
916+
Int
917+
( VerificationKey GenesisKey
918+
, ( VerificationKey GenesisDelegateKey
919+
, VerificationKey VrfKey
920+
)
921+
)
923922
combinedMap =
924923
Map.intersectionWith
925924
(,)
@@ -939,8 +938,8 @@ readGenDelegsMap genesisKeys delegateKeys delegateVrfKeys = do
939938

940939
let delegsMap
941940
:: Map
942-
(Hash GenesisKey)
943-
(Hash GenesisDelegateKey, Hash VrfKey)
941+
(Hash GenesisKey)
942+
(Hash GenesisDelegateKey, Hash VrfKey)
944943
delegsMap =
945944
fromList
946945
[ (gh, (dh, vh))

‎cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,8 +1671,8 @@ runQuerySPOStakeDistribution
16711671

16721672
let addressesAndRewards
16731673
:: Map
1674-
StakeAddress
1675-
(L.KeyHash L.StakePool StandardCrypto) =
1674+
StakeAddress
1675+
(L.KeyHash L.StakePool StandardCrypto) =
16761676
Map.fromList
16771677
[ ( makeStakeAddress networkId . fromShelleyStakeCredential . L.raCredential . L.ppRewardAccount $ addr
16781678
, keyHash
@@ -1792,15 +1792,15 @@ runQuery
17921792
:: LocalNodeConnectInfo
17931793
-> Consensus.Target ChainPoint
17941794
-> LocalStateQueryExpr
1795-
BlockInMode
1796-
ChainPoint
1797-
QueryInMode
1798-
()
1799-
IO
1800-
( Either
1801-
UnsupportedNtcVersionError
1802-
(Either Consensus.EraMismatch a)
1803-
)
1795+
BlockInMode
1796+
ChainPoint
1797+
QueryInMode
1798+
()
1799+
IO
1800+
( Either
1801+
UnsupportedNtcVersionError
1802+
(Either Consensus.EraMismatch a)
1803+
)
18041804
-> ExceptT QueryCmdError IO a
18051805
runQuery localNodeConnInfo target query =
18061806
firstExceptT

‎cardano-cli/src/Cardano/CLI/Run/Node.hs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,11 @@ runNodeIssueOpCertCmd
282282

283283
textEnvPossibleBlockIssuers
284284
:: [ FromSomeType
285-
HasTextEnvelope
286-
( Either
287-
(SigningKey StakePoolKey)
288-
(SigningKey GenesisDelegateExtendedKey)
289-
)
285+
HasTextEnvelope
286+
( Either
287+
(SigningKey StakePoolKey)
288+
(SigningKey GenesisDelegateExtendedKey)
289+
)
290290
]
291291
textEnvPossibleBlockIssuers =
292292
[ FromSomeType (AsSigningKey AsStakePoolKey) Left
@@ -296,11 +296,11 @@ runNodeIssueOpCertCmd
296296

297297
bech32PossibleBlockIssuers
298298
:: [ FromSomeType
299-
SerialiseAsBech32
300-
( Either
301-
(SigningKey StakePoolKey)
302-
(SigningKey GenesisDelegateExtendedKey)
303-
)
299+
SerialiseAsBech32
300+
( Either
301+
(SigningKey StakePoolKey)
302+
(SigningKey GenesisDelegateExtendedKey)
303+
)
304304
]
305305
bech32PossibleBlockIssuers =
306306
[FromSomeType (AsSigningKey AsStakePoolKey) Left]

‎cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ validateTxCurrentTreasuryValue
100100
=> ShelleyBasedEra era
101101
-> Maybe TxCurrentTreasuryValue
102102
-> Either
103-
(TxNotSupportedInEraValidationError era)
104-
(Maybe (Featured ConwayEraOnwards era (Maybe Lovelace)))
103+
(TxNotSupportedInEraValidationError era)
104+
(Maybe (Featured ConwayEraOnwards era (Maybe Lovelace)))
105105
validateTxCurrentTreasuryValue sbe mCurrentTreasuryValue =
106106
case mCurrentTreasuryValue of
107107
Nothing -> Right Nothing
@@ -195,8 +195,8 @@ validateUpdateProposalFile
195195
:: CardanoEra era
196196
-> Maybe UpdateProposalFile
197197
-> Either
198-
(TxNotSupportedInEraValidationError era)
199-
(Maybe (Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile)))
198+
(TxNotSupportedInEraValidationError era)
199+
(Maybe (Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile)))
200200
validateUpdateProposalFile era = \case
201201
Nothing -> pure Nothing
202202
Just updateProposal -> do

‎cardano-cli/src/Cardano/CLI/Types/Output.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ instance ToJSON QueryDRepStateOutput where
195195
, "deposit" .= deposit
196196
]
197197
<> ( case includeStake of
198-
WithStake -> ["stake" .= stake]
199-
NoStake -> []
198+
WithStake -> ["stake" .= stake]
199+
NoStake -> []
200200
)
201201
)
202202

‎flake.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)