Skip to content

Commit 7eb5124

Browse files
CmdvCmdv
committed
fourmolu the code
1 parent 80746c7 commit 7eb5124

File tree

21 files changed

+934
-812
lines changed

21 files changed

+934
-812
lines changed

‎cardano-chain-gen/cardano-chain-gen.cabal‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ test-suite cardano-chain-gen
142142
Test.Cardano.Db.Mock.Unit.Conway.Config.JsonbInSchema
143143
Test.Cardano.Db.Mock.Unit.Conway.Config.MigrateConsumedPruneTxOut
144144
Test.Cardano.Db.Mock.Unit.Conway.Config.Parse
145+
Test.Cardano.Db.Mock.Unit.Conway.Config.Schema
145146
Test.Cardano.Db.Mock.Unit.Conway.Governance
146147
Test.Cardano.Db.Mock.Unit.Conway.InlineAndReference
147148
Test.Cardano.Db.Mock.Unit.Conway.Other

‎cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Config/Schema.hs‎

Lines changed: 91 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
{-# LANGUAGE CPP #-}
22
{-# LANGUAGE NumericUnderscores #-}
3+
{-# LANGUAGE OverloadedStrings #-}
34
{-# LANGUAGE RankNTypes #-}
45
{-# LANGUAGE TypeApplications #-}
5-
{-# LANGUAGE OverloadedStrings #-}
6-
76

87
module Test.Cardano.Db.Mock.Unit.Conway.Config.Schema where
98

10-
119
import qualified Cardano.Db as DB
10+
import qualified Cardano.Db.Schema.Variants.TxOutAddress as DB
11+
import qualified Cardano.Db.Schema.Variants.TxOutCore as DB
1212
import Cardano.Mock.ChainSync.Server (IOManager (), ServerHandle)
1313
import Cardano.Mock.Forging.Interpreter (Interpreter)
1414
import qualified Cardano.Mock.Forging.Tx.Conway as Conway
15-
import Cardano.Mock.Forging.Types (UTxOIndex (..), CardanoBlock)
16-
import Cardano.Prelude hiding (show, putStrLn)
15+
import Cardano.Mock.Forging.Types (CardanoBlock, UTxOIndex (..))
16+
import Cardano.Prelude hiding (putStrLn, show)
1717
import qualified Data.Text as Text
1818
import Test.Cardano.Db.Mock.Config
1919
import Test.Cardano.Db.Mock.UnifiedApi
2020
import Test.Cardano.Db.Mock.Validate
2121
import Test.Tasty.HUnit (Assertion, assertBool)
22-
import qualified Cardano.Db.Schema.Variants.TxOutCore as DB
23-
import qualified Cardano.Db.Schema.Variants.TxOutAddress as DB
2422

2523
------------------------------------------------------------------------------
2624
-- Main Schema Validation Test
@@ -30,112 +28,109 @@ import qualified Cardano.Db.Schema.Variants.TxOutAddress as DB
3028
validateSchemaColumns :: IOManager -> [(Text, Text)] -> Assertion
3129
validateSchemaColumns =
3230
withFullConfigDropDb conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
33-
startDBSync dbSync
34-
35-
-- Setup test data
36-
setupTestData interpreter mockServer dbSync
37-
38-
-- Cardano.Db.Schema.Core.Base
39-
validateCall dbSync (Proxy @DB.Block)
40-
validateCall dbSync (Proxy @DB.Tx)
41-
validateCall dbSync (Proxy @DB.TxMetadata)
42-
validateCall dbSync (Proxy @DB.TxIn)
43-
validateCall dbSync (Proxy @DB.CollateralTxIn)
44-
validateCall dbSync (Proxy @DB.ReferenceTxIn)
45-
validateCall dbSync (Proxy @DB.ReverseIndex)
46-
validateCall dbSync (Proxy @DB.TxCbor)
47-
validateCall dbSync (Proxy @DB.Datum)
48-
validateCall dbSync (Proxy @DB.Script)
49-
validateCall dbSync (Proxy @DB.Redeemer)
50-
validateCall dbSync (Proxy @DB.RedeemerData)
51-
validateCall dbSync (Proxy @DB.ExtraKeyWitness)
52-
validateCall dbSync (Proxy @DB.SlotLeader)
53-
validateCall dbSync (Proxy @DB.SchemaVersion)
54-
validateCall dbSync (Proxy @DB.Meta)
55-
validateCall dbSync (Proxy @DB.Withdrawal)
56-
validateCall dbSync (Proxy @DB.ExtraMigrations)
57-
58-
-- Cardano.Db.Schema.Core.Pool
59-
validateCall dbSync (Proxy @DB.PoolHash)
60-
validateCall dbSync (Proxy @DB.PoolStat)
61-
validateCall dbSync (Proxy @DB.PoolUpdate)
62-
validateCall dbSync (Proxy @DB.PoolMetadataRef)
63-
validateCall dbSync (Proxy @DB.PoolOwner)
64-
validateCall dbSync (Proxy @DB.PoolRetire)
65-
validateCall dbSync (Proxy @DB.PoolRelay)
66-
validateCall dbSync (Proxy @DB.DelistedPool)
67-
validateCall dbSync (Proxy @DB.ReservedPoolTicker)
68-
69-
-- Cardano.Db.Schema.Core.OffChain
70-
validateCall dbSync (Proxy @DB.OffChainPoolData)
71-
validateCall dbSync (Proxy @DB.OffChainPoolFetchError)
72-
validateCall dbSync (Proxy @DB.OffChainVoteData)
73-
validateCall dbSync (Proxy @DB.OffChainVoteGovActionData)
74-
validateCall dbSync (Proxy @DB.OffChainVoteDrepData)
75-
validateCall dbSync (Proxy @DB.OffChainVoteAuthor)
76-
validateCall dbSync (Proxy @DB.OffChainVoteReference)
77-
validateCall dbSync (Proxy @DB.OffChainVoteExternalUpdate)
78-
validateCall dbSync (Proxy @DB.OffChainVoteFetchError)
79-
80-
-- Cardano.Db.Schema.Core.MultiAsset
81-
validateCall dbSync (Proxy @DB.MultiAsset)
82-
validateCall dbSync (Proxy @DB.MaTxMint)
83-
84-
-- Cardano.Db.Schema.Core.StakeDeligation
85-
validateCall dbSync (Proxy @DB.StakeAddress)
86-
validateCall dbSync (Proxy @DB.StakeRegistration)
87-
validateCall dbSync (Proxy @DB.StakeDeregistration)
88-
validateCall dbSync (Proxy @DB.Delegation)
89-
validateCall dbSync (Proxy @DB.Reward)
90-
validateCall dbSync (Proxy @DB.RewardRest)
91-
validateCall dbSync (Proxy @DB.EpochStake)
92-
validateCall dbSync (Proxy @DB.EpochStakeProgress)
93-
94-
-- Cardano.Db.Schema.Core.EpochAndProtocol
95-
validateCall dbSync (Proxy @DB.Epoch)
96-
validateCall dbSync (Proxy @DB.EpochParam)
97-
validateCall dbSync (Proxy @DB.EpochState)
98-
validateCall dbSync (Proxy @DB.AdaPots)
99-
validateCall dbSync (Proxy @DB.PotTransfer)
100-
validateCall dbSync (Proxy @DB.Treasury)
101-
validateCall dbSync (Proxy @DB.Reserve)
102-
validateCall dbSync (Proxy @DB.CostModel)
103-
104-
-- Cardano.Db.Schema.Variants.TxOutCore
105-
validateCall dbSync (Proxy @DB.TxOutCore)
106-
validateCall dbSync (Proxy @DB.CollateralTxOutCore)
107-
validateCall dbSync (Proxy @DB.MaTxOutCore)
108-
31+
startDBSync dbSync
32+
33+
-- Setup test data
34+
setupTestData interpreter mockServer dbSync
35+
36+
-- Cardano.Db.Schema.Core.Base
37+
validateCall dbSync (Proxy @DB.Block)
38+
validateCall dbSync (Proxy @DB.Tx)
39+
validateCall dbSync (Proxy @DB.TxMetadata)
40+
validateCall dbSync (Proxy @DB.TxIn)
41+
validateCall dbSync (Proxy @DB.CollateralTxIn)
42+
validateCall dbSync (Proxy @DB.ReferenceTxIn)
43+
validateCall dbSync (Proxy @DB.ReverseIndex)
44+
validateCall dbSync (Proxy @DB.TxCbor)
45+
validateCall dbSync (Proxy @DB.Datum)
46+
validateCall dbSync (Proxy @DB.Script)
47+
validateCall dbSync (Proxy @DB.Redeemer)
48+
validateCall dbSync (Proxy @DB.RedeemerData)
49+
validateCall dbSync (Proxy @DB.ExtraKeyWitness)
50+
validateCall dbSync (Proxy @DB.SlotLeader)
51+
validateCall dbSync (Proxy @DB.SchemaVersion)
52+
validateCall dbSync (Proxy @DB.Meta)
53+
validateCall dbSync (Proxy @DB.Withdrawal)
54+
validateCall dbSync (Proxy @DB.ExtraMigrations)
55+
56+
-- Cardano.Db.Schema.Core.Pool
57+
validateCall dbSync (Proxy @DB.PoolHash)
58+
validateCall dbSync (Proxy @DB.PoolStat)
59+
validateCall dbSync (Proxy @DB.PoolUpdate)
60+
validateCall dbSync (Proxy @DB.PoolMetadataRef)
61+
validateCall dbSync (Proxy @DB.PoolOwner)
62+
validateCall dbSync (Proxy @DB.PoolRetire)
63+
validateCall dbSync (Proxy @DB.PoolRelay)
64+
validateCall dbSync (Proxy @DB.DelistedPool)
65+
validateCall dbSync (Proxy @DB.ReservedPoolTicker)
66+
67+
-- Cardano.Db.Schema.Core.OffChain
68+
validateCall dbSync (Proxy @DB.OffChainPoolData)
69+
validateCall dbSync (Proxy @DB.OffChainPoolFetchError)
70+
validateCall dbSync (Proxy @DB.OffChainVoteData)
71+
validateCall dbSync (Proxy @DB.OffChainVoteGovActionData)
72+
validateCall dbSync (Proxy @DB.OffChainVoteDrepData)
73+
validateCall dbSync (Proxy @DB.OffChainVoteAuthor)
74+
validateCall dbSync (Proxy @DB.OffChainVoteReference)
75+
validateCall dbSync (Proxy @DB.OffChainVoteExternalUpdate)
76+
validateCall dbSync (Proxy @DB.OffChainVoteFetchError)
77+
78+
-- Cardano.Db.Schema.Core.MultiAsset
79+
validateCall dbSync (Proxy @DB.MultiAsset)
80+
validateCall dbSync (Proxy @DB.MaTxMint)
81+
82+
-- Cardano.Db.Schema.Core.StakeDeligation
83+
validateCall dbSync (Proxy @DB.StakeAddress)
84+
validateCall dbSync (Proxy @DB.StakeRegistration)
85+
validateCall dbSync (Proxy @DB.StakeDeregistration)
86+
validateCall dbSync (Proxy @DB.Delegation)
87+
validateCall dbSync (Proxy @DB.Reward)
88+
validateCall dbSync (Proxy @DB.RewardRest)
89+
validateCall dbSync (Proxy @DB.EpochStake)
90+
validateCall dbSync (Proxy @DB.EpochStakeProgress)
91+
92+
-- Cardano.Db.Schema.Core.EpochAndProtocol
93+
validateCall dbSync (Proxy @DB.Epoch)
94+
validateCall dbSync (Proxy @DB.EpochParam)
95+
validateCall dbSync (Proxy @DB.EpochState)
96+
validateCall dbSync (Proxy @DB.AdaPots)
97+
validateCall dbSync (Proxy @DB.PotTransfer)
98+
validateCall dbSync (Proxy @DB.Treasury)
99+
validateCall dbSync (Proxy @DB.Reserve)
100+
validateCall dbSync (Proxy @DB.CostModel)
101+
102+
-- Cardano.Db.Schema.Variants.TxOutCore
103+
validateCall dbSync (Proxy @DB.TxOutCore)
104+
validateCall dbSync (Proxy @DB.CollateralTxOutCore)
105+
validateCall dbSync (Proxy @DB.MaTxOutCore)
109106
where
110107
testLabel = "validateSchemaColumns"
111108

112-
113109
validateVariantAddressSchemaColumns :: IOManager -> [(Text, Text)] -> Assertion
114110
validateVariantAddressSchemaColumns =
115111
withCustomConfigDropDb args (Just $ configPruneForceTxIn True) cfgDir testLabel $ \interpreter mockServer dbSync -> do
116-
startDBSync dbSync
117-
118-
-- Setup test data
119-
setupTestData interpreter mockServer dbSync
112+
startDBSync dbSync
120113

121-
-- Cardano.Db.Schema.Variants.TxOutAddress
122-
validateCall dbSync (Proxy @DB.TxOutAddress)
123-
validateCall dbSync (Proxy @DB.CollateralTxOutAddress)
124-
validateCall dbSync (Proxy @DB.Address)
125-
validateCall dbSync (Proxy @DB.MaTxOutAddress)
114+
-- Setup test data
115+
setupTestData interpreter mockServer dbSync
126116

117+
-- Cardano.Db.Schema.Variants.TxOutAddress
118+
validateCall dbSync (Proxy @DB.TxOutAddress)
119+
validateCall dbSync (Proxy @DB.CollateralTxOutAddress)
120+
validateCall dbSync (Proxy @DB.Address)
121+
validateCall dbSync (Proxy @DB.MaTxOutAddress)
127122
where
128123
args = initCommandLineArgs
129124
cfgDir = conwayConfigDir
130125
testLabel = "validateVariantAddressSchemaColumns"
131126

132-
133127
-- | Setup minimal test data for validation
134128
setupTestData :: Interpreter -> ServerHandle IO CardanoBlock -> DBSyncEnv -> IO ()
135129
setupTestData interpreter mockServer dbSync = do
136130
void $ forgeAndSubmitBlocks interpreter mockServer 5
137-
void $ withConwayFindLeaderAndSubmitTx interpreter mockServer $
138-
Conway.mkPaymentTx (UTxOIndex 0) (UTxOIndex 1) 10_000 10_000 0
131+
void $
132+
withConwayFindLeaderAndSubmitTx interpreter mockServer $
133+
Conway.mkPaymentTx (UTxOIndex 0) (UTxOIndex 1) 10_000 10_000 0
139134
assertBlockNoBackoff dbSync 6
140135

141136
------------------------------------------------------------------------------

‎cardano-db-sync/src/Cardano/DbSync/Default.hs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ insertBlock syncEnv cblk applyRes firstAfterRollback tookSnapshot = do
204204
ranIndexes <- liftIO $ getRanIndexes syncEnv
205205
addConstraintsIfNotExist syncEnv tracer
206206
unless ranIndexes $
207-
liftIO $ runIndexMigrations syncEnv
207+
liftIO $
208+
runIndexMigrations syncEnv
208209

209210
isWithinTwoMin :: SlotDetails -> Bool
210211
isWithinTwoMin sd = isSyncedWithinSeconds sd 120 == SyncFollowing

‎cardano-db-sync/src/Cardano/DbSync/Era/Universal/Epoch.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
{-# LANGUAGE FlexibleContexts #-}
55
{-# LANGUAGE OverloadedStrings #-}
66
{-# LANGUAGE RankNTypes #-}
7+
{-# LANGUAGE RecordWildCards #-}
78
{-# LANGUAGE ScopedTypeVariables #-}
89
{-# LANGUAGE TupleSections #-}
910
{-# LANGUAGE TypeFamilies #-}
1011
{-# LANGUAGE NoImplicitPrelude #-}
11-
{-# LANGUAGE RecordWildCards #-}
1212

1313
module Cardano.DbSync.Era.Universal.Epoch (
1414
insertOnNewEpoch,
@@ -48,9 +48,9 @@ import Cardano.Ledger.Conway.PParams (DRepVotingThresholds (..))
4848
import Cardano.Ledger.Conway.Rules (RatifyState (..))
4949
import Cardano.Prelude
5050
import Cardano.Slotting.Slot (EpochNo (..), SlotNo)
51+
import Control.Concurrent.Class.MonadSTM.Strict (readTVarIO)
5152
import qualified Data.Map.Strict as Map
5253
import qualified Data.Set as Set
53-
import Control.Concurrent.Class.MonadSTM.Strict (readTVarIO)
5454

5555
{- HLINT ignore "Use readTVarIO" -}
5656

‎cardano-db/src/Cardano/Db/Schema/Core/Base.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,6 @@ type instance Key Redeemer = RedeemerId
623623
instance DbInfo Redeemer where
624624
enumFields _ = [("purpose", "scriptpurposetype")]
625625

626-
627626
entityRedeemerDecoder :: D.Row (Entity Redeemer)
628627
entityRedeemerDecoder =
629628
Entity

‎cardano-db/src/Cardano/Db/Schema/Core/StakeDeligation.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import Hasql.Encoders as E
1515

1616
import Cardano.Db.Schema.Ids
1717
import Cardano.Db.Schema.Orphans ()
18+
import Cardano.Db.Schema.Types (textDecoder)
1819
import Cardano.Db.Statement.Function.Core (bulkEncoder)
1920
import Cardano.Db.Statement.Types (DbInfo (..), Entity (..), Key)
2021
import Cardano.Db.Types (
@@ -27,7 +28,6 @@ import Cardano.Db.Types (
2728
rewardSourceDecoder,
2829
rewardSourceEncoder,
2930
)
30-
import Cardano.Db.Schema.Types (textDecoder)
3131

3232
-----------------------------------------------------------------------------------------------------------------------------------
3333

‎cardano-db/src/Cardano/Db/Schema/Types.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ module Cardano.Db.Schema.Types where
55

66
import Data.ByteString.Char8 (ByteString)
77
import Data.Text (Text)
8+
import qualified Data.Text.Encoding as Text
9+
import qualified Data.Text.Encoding.Error as TextError
810
import GHC.Generics (Generic)
911
import qualified Hasql.Decoders as HsqlD
1012
import Quiet (Quiet (..))
11-
import qualified Data.Text.Encoding as Text
12-
import qualified Data.Text.Encoding.Error as TextError
1313

1414
newtype AddressHash -- Length (28 bytes) enforced by Postgres
1515
= AddressHash {unAddressHash :: ByteString}

‎cardano-db/src/Cardano/Db/Schema/Variants/TxOutAddress.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import qualified Hasql.Decoders as D
1515
import qualified Hasql.Encoders as E
1616

1717
import qualified Cardano.Db.Schema.Ids as Id
18+
import Cardano.Db.Schema.Types (textDecoder)
1819
import Cardano.Db.Statement.Function.Core (bulkEncoder)
1920
import Cardano.Db.Statement.Types (DbInfo (..), Entity (..), Key)
2021
import Cardano.Db.Types (DbLovelace, DbWord64 (..), dbLovelaceDecoder, dbLovelaceEncoder, dbLovelaceValueEncoder)
21-
import Cardano.Db.Schema.Types (textDecoder)
2222

2323
-----------------------------------------------------------------------------------------------
2424
-- TxOutAddress

‎cardano-db/src/Cardano/Db/Statement/Base.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ import Cardano.Db.Schema.Variants (TxOutVariantType)
3434
import Cardano.Db.Statement.Function.Core (ResultType (..), ResultTypeBulk (..), mkDbCallStack, runDbSession)
3535
import Cardano.Db.Statement.Function.Delete (deleteWhereCount)
3636
import Cardano.Db.Statement.Function.Insert (insert, insertCheckUnique)
37+
import Cardano.Db.Statement.Function.InsertBulk (insertBulk, insertBulkJsonb)
3738
import Cardano.Db.Statement.Function.Query (adaSumDecoder, countAll, parameterisedCountWhere, queryMinRefId)
3839
import Cardano.Db.Statement.GovernanceAndVoting (setNullDroppedStmt, setNullEnactedStmt, setNullExpiredStmt, setNullRatifiedStmt)
3940
import Cardano.Db.Statement.Rollback (deleteTablesAfterBlockId)
4041
import Cardano.Db.Statement.Types (DbInfo, Entity (..), tableName, validateColumn)
4142
import Cardano.Db.Statement.Variants.TxOut (querySetNullTxOut)
4243
import Cardano.Db.Types (Ada (..), DbAction, DbWord64, ExtraMigration, extraDescription)
43-
import Cardano.Db.Statement.Function.InsertBulk (insertBulkJsonb, insertBulk)
4444

4545
--------------------------------------------------------------------------------
4646
-- Block

0 commit comments

Comments
 (0)