Skip to content

Commit c2f98d0

Browse files
CmdvCmdv
committed
remove migration fix related code
1 parent 52ada06 commit c2f98d0

File tree

30 files changed

+161
-4169
lines changed

30 files changed

+161
-4169
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,21 @@ test-suite cardano-chain-gen
130130
other-modules: Test.Cardano.Db.Mock.Config
131131
Test.Cardano.Db.Mock.Examples
132132
Test.Cardano.Db.Mock.Property.Property
133+
Test.Cardano.Db.Mock.UnifiedApi
134+
Test.Cardano.Db.Mock.Unit.Alonzo
135+
Test.Cardano.Db.Mock.Unit.Alonzo.Config
136+
Test.Cardano.Db.Mock.Unit.Alonzo.Simple
137+
Test.Cardano.Db.Mock.Unit.Alonzo.Tx
138+
Test.Cardano.Db.Mock.Unit.Babbage
139+
Test.Cardano.Db.Mock.Unit.Babbage.Reward
140+
Test.Cardano.Db.Mock.Unit.Babbage.Simple
141+
Test.Cardano.Db.Mock.Unit.Babbage.Tx
133142
Test.Cardano.Db.Mock.Unit.Conway
134143
Test.Cardano.Db.Mock.Unit.Conway.CommandLineArg.ConfigFile
135144
Test.Cardano.Db.Mock.Unit.Conway.CommandLineArg.EpochDisabled
136145
Test.Cardano.Db.Mock.Unit.Conway.Config.JsonbInSchema
137-
Test.Cardano.Db.Mock.Unit.Conway.Config.Parse
138146
Test.Cardano.Db.Mock.Unit.Conway.Config.MigrateConsumedPruneTxOut
147+
Test.Cardano.Db.Mock.Unit.Conway.Config.Parse
139148
Test.Cardano.Db.Mock.Unit.Conway.Governance
140149
Test.Cardano.Db.Mock.Unit.Conway.InlineAndReference
141150
Test.Cardano.Db.Mock.Unit.Conway.Other
@@ -145,7 +154,6 @@ test-suite cardano-chain-gen
145154
Test.Cardano.Db.Mock.Unit.Conway.Simple
146155
Test.Cardano.Db.Mock.Unit.Conway.Stake
147156
Test.Cardano.Db.Mock.Unit.Conway.Tx
148-
Test.Cardano.Db.Mock.UnifiedApi
149157
Test.Cardano.Db.Mock.Validate
150158

151159
build-depends: aeson

‎cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Babbage.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ mkUTxOBabbage :: AlonzoTx StandardBabbage -> [(TxIn StandardCrypto, BabbageTxOut
462462
mkUTxOBabbage = mkUTxOAlonzo
463463

464464
mkUTxOCollBabbage ::
465-
(BabbageEraTxBody era) =>
465+
BabbageEraTxBody era =>
466466
AlonzoTx era ->
467467
[(TxIn (EraCrypto era), TxOut era)]
468468
mkUTxOCollBabbage tx = Map.toList $ unUTxO $ collOuts $ getField @"body" tx

‎cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Conway.hs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,11 +542,13 @@ mkTxDelegCert ::
542542
mkTxDelegCert f = ConwayTxCertDeleg . f
543543

544544
mkAddCommitteeTx ::
545+
Maybe (Governance.GovPurposeId 'Governance.CommitteePurpose StandardConway) ->
545546
Credential 'ColdCommitteeRole StandardCrypto ->
546547
AlonzoTx StandardConway
547-
mkAddCommitteeTx cred = mkGovActionProposalTx govAction
548+
mkAddCommitteeTx prevGovAction cred = mkGovActionProposalTx govAction
548549
where
549-
govAction = Governance.UpdateCommittee SNothing mempty newMembers threshold
550+
govAction = Governance.UpdateCommittee prevGovAction' mempty newMembers threshold
551+
prevGovAction' = maybeToStrictMaybe prevGovAction
550552
newMembers = Map.singleton cred (EpochNo 20)
551553
threshold = fromJust $ boundRational (1 % 1)
552554

‎cardano-chain-gen/src/Cardano/Mock/Query.hs‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ queryDRepDistrAmount drepHash epochNo = do
9999
from
100100
$ table @Db.DrepDistr
101101
`innerJoin` table @Db.DrepHash
102-
`on` (\(distr :& hash) -> (hash ^. Db.DrepHashId) ==. (distr ^. Db.DrepDistrHashId))
102+
`on` (\(distr :& hash) -> (hash ^. Db.DrepHashId) ==. (distr ^. Db.DrepDistrHashId))
103103

104104
where_ $ hash ^. Db.DrepHashRaw ==. just (val drepHash)
105105
where_ $ distr ^. Db.DrepDistrEpochNo ==. val epochNo
@@ -141,13 +141,13 @@ queryConstitutionAnchor epochNo = do
141141
from
142142
$ table @Db.Constitution
143143
`innerJoin` table @Db.VotingAnchor
144-
`on` ( \(constit :& anchor) ->
145-
(constit ^. Db.ConstitutionVotingAnchorId) ==. (anchor ^. Db.VotingAnchorId)
146-
)
144+
`on` ( \(constit :& anchor) ->
145+
(constit ^. Db.ConstitutionVotingAnchorId) ==. (anchor ^. Db.VotingAnchorId)
146+
)
147147
`innerJoin` table @Db.EpochState
148-
`on` ( \(constit :& _ :& epoch) ->
149-
just (constit ^. Db.ConstitutionId) ==. (epoch ^. Db.EpochStateConstitutionId)
150-
)
148+
`on` ( \(constit :& _ :& epoch) ->
149+
just (constit ^. Db.ConstitutionId) ==. (epoch ^. Db.EpochStateConstitutionId)
150+
)
151151

152152
where_ (epochState ^. Db.EpochStateEpochNo ==. val epochNo)
153153

@@ -194,10 +194,12 @@ queryVoteCounts txHash idx = do
194194
from
195195
$ table @Db.VotingProcedure
196196
`innerJoin` table @Db.Tx
197-
`on` (\(vote :& tx) -> vote ^. Db.VotingProcedureTxId ==. tx ^. Db.TxId)
198-
where_ $
199-
vote ^. Db.VotingProcedureVote ==. val v
200-
&&. tx ^. Db.TxHash ==. val txHash
201-
&&. vote ^. Db.VotingProcedureIndex ==. val idx
197+
`on` (\(vote :& tx) -> vote ^. Db.VotingProcedureTxId ==. tx ^. Db.TxId)
198+
where_
199+
$ vote
200+
^. Db.VotingProcedureVote
201+
==. val v
202+
&&. tx ^. Db.TxHash ==. val txHash
203+
&&. vote ^. Db.VotingProcedureIndex ==. val idx
202204
pure countRows
203205
pure (maybe 0 unValue res)

‎cardano-chain-gen/test/Main.hs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import System.Directory (getCurrentDirectory)
77
import System.Environment (lookupEnv, setEnv)
88
import System.FilePath ((</>))
99
import qualified Test.Cardano.Db.Mock.Property.Property as Property
10+
import qualified Test.Cardano.Db.Mock.Unit.Alonzo as Alonzo
11+
import qualified Test.Cardano.Db.Mock.Unit.Babbage as Babbage
1012
import qualified Test.Cardano.Db.Mock.Unit.Conway as Conway
1113
import Test.Tasty
1214
import Test.Tasty.QuickCheck (testProperty)
@@ -28,6 +30,8 @@ tests iom = do
2830
testGroup
2931
"cardano-chain-gen"
3032
[ Conway.unitTests iom knownMigrationsPlain
33+
, Babbage.unitTests iom knownMigrationsPlain
34+
, Alonzo.unitTests iom knownMigrationsPlain
3135
, testProperty "QSM" $ Property.prop_empty_blocks iom knownMigrationsPlain
3236
]
3337
where

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ data CommandLineArgs = CommandLineArgs
122122
, claEpochDisabled :: Bool
123123
, claHasCache :: Bool
124124
, claHasLedger :: Bool
125-
, claSkipFix :: Bool
126-
, claOnlyFix :: Bool
127125
, claForceIndexes :: Bool
128126
, claHasMultiAssets :: Bool
129127
, claHasMetadata :: Bool
@@ -286,8 +284,6 @@ mkSyncNodeParams staticDir mutableDir CommandLineArgs {..} = do
286284
, enpPGPassSource = DB.PGPassCached pgconfig
287285
, enpEpochDisabled = claEpochDisabled
288286
, enpHasCache = claHasCache
289-
, enpSkipFix = claSkipFix
290-
, enpOnlyFix = claOnlyFix
291287
, enpForceIndexes = claForceIndexes
292288
, enpHasInOut = True
293289
, enpSnEveryFollowing = 35
@@ -361,8 +357,6 @@ initCommandLineArgs =
361357
, claEpochDisabled = True
362358
, claHasCache = True
363359
, claHasLedger = True
364-
, claSkipFix = True
365-
, claOnlyFix = False
366360
, claForceIndexes = False
367361
, claHasMultiAssets = True
368362
, claHasMetadata = True

‎cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Alonzo.hs‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{-# LANGUAGE DataKinds #-}
2+
{-# LANGUAGE OverloadedStrings #-}
3+
4+
module Test.Cardano.Db.Mock.Unit.Alonzo (
5+
unitTests,
6+
) where
7+
8+
import Cardano.Mock.ChainSync.Server (IOManager)
9+
import Data.Text (Text)
10+
import Test.Tasty (TestTree, testGroup)
11+
import Test.Tasty.HUnit (Assertion, testCase)
12+
13+
import qualified Test.Cardano.Db.Mock.Unit.Alonzo.Config as AlzConfig
14+
import qualified Test.Cardano.Db.Mock.Unit.Alonzo.Simple as AlzSimple
15+
import qualified Test.Cardano.Db.Mock.Unit.Alonzo.Tx as AlzTx
16+
17+
{- HLINT ignore "Reduce duplication" -}
18+
19+
unitTests :: IOManager -> [(Text, Text)] -> TestTree
20+
unitTests iom knownMigrations =
21+
testGroup
22+
"Alonzo unit tests"
23+
[ testGroup
24+
"config"
25+
[ testCase "default insert config" AlzConfig.defaultInsertConfig
26+
, testCase "insert config" AlzConfig.insertConfig
27+
]
28+
, testGroup
29+
"simple"
30+
[ test "simple forge blocks" AlzSimple.forgeBlocks
31+
, test "sync one block" AlzSimple.addSimple
32+
, test "restart db-sync" AlzSimple.restartDBSync
33+
, test "sync small chain" AlzSimple.addSimpleChain
34+
]
35+
, testGroup
36+
"blocks with txs"
37+
[ test "simple tx" AlzTx.addSimpleTx
38+
, test "consume utxo same block" AlzTx.consumeSameBlock
39+
]
40+
]
41+
where
42+
test :: String -> (IOManager -> [(Text, Text)] -> Assertion) -> TestTree
43+
test str action = testCase str (action iom knownMigrations)

0 commit comments

Comments
 (0)