test(cardano-chain-gen): Fix up imports

Author: sgillespie

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Other.hs

@@ -24,16 +24,7 @@ module Test.Cardano.Db.Mock.Unit.Conway.Other (
   forkParam,
 ) where
 
-import Cardano.Db (
-  EntityField (
-    EpochParamEpochNo,
-    EpochParamProtocolMajor,
-    ParamProposalEpochNo,
-    ParamProposalProtocolMajor
-  ),
-  EpochParam (),
-  ParamProposal (),
- )
+import qualified Cardano.Db as Db
 import Cardano.DbSync.Era.Shelley.Generic.Util (unKeyHashRaw)
 import Cardano.Ledger.BaseTypes (EpochNo (..))
 import Cardano.Ledger.Conway.TxCert (ConwayTxCert (..))
@@ -51,17 +42,7 @@ import Cardano.Prelude hiding (from)
 import Cardano.SMASH.Server.PoolDataLayer (PoolDataLayer (..), dbToServantPoolId)
 import Cardano.SMASH.Server.Types (DBFail (..))
 import Data.List (last)
-import Database.Esqueleto.Experimental (
-  from,
-  selectOne,
-  table,
-  unValue,
-  val,
-  where_,
-  (==.),
-  (^.),
- )
-import Database.Persist.Sql (SqlBackend ())
+import Database.Esqueleto.Experimental
 import Ouroboros.Consensus.Shelley.Eras (StandardConway ())
 import Ouroboros.Network.Block (blockPoint)
 import Test.Cardano.Db.Mock.Config
@@ -469,12 +450,10 @@ forkParam =
   withFullConfig configDir testLabel $ \interpreter mockServer dbSync -> do
     startDBSync dbSync
 
-    -- Forge a block with stake credentials
-    void $ Api.registerAllStakeCreds interpreter mockServer
     -- Protocol params aren't added to the DB until the following epoch
     epoch0 <- Api.fillUntilNextEpoch interpreter mockServer
     -- Wait for it to sync
-    assertBlockNoBackoff dbSync (1 + length epoch0)
+    assertBlockNoBackoff dbSync (length epoch0)
     -- Protocol major version should still match config
     assertEqBackoff
       dbSync
@@ -488,7 +467,7 @@ forkParam =
       Api.withBabbageFindLeaderAndSubmitTx interpreter mockServer $
         const Babbage.mkParamUpdateTx
     -- Wait for it to sync
-    assertBlockNoBackoff dbSync (2 + length epoch0)
+    assertBlockNoBackoff dbSync (1 + length epoch0)
     -- Query protocol param proposals
     assertEqBackoff
       dbSync
@@ -500,7 +479,7 @@ forkParam =
     -- The fork will be applied on the first block of the next epoch
     epoch1 <- Api.fillUntilNextEpoch interpreter mockServer
     -- Wait for it to sync
-    assertBlockNoBackoff dbSync $ 2 + length (epoch0 <> epoch1)
+    assertBlockNoBackoff dbSync $ 1 + length (epoch0 <> epoch1)
     -- Protocol major version should now be updated
     assertEqBackoff
       dbSync
@@ -514,7 +493,7 @@ forkParam =
       Api.withConwayFindLeaderAndSubmitTx interpreter mockServer $
         Conway.mkPaymentTx (UTxOIndex 0) (UTxOIndex 1) 10_000 500
     -- Wait for it to sync
-    assertBlockNoBackoff dbSync $ 3 + length (epoch0 <> epoch1)
+    assertBlockNoBackoff dbSync $ 2 + length (epoch0 <> epoch1)
   where
     testLabel = "conwayForkParam"
     configDir = babbageConfigDir
@@ -529,9 +508,9 @@ forkParam =
 
       -- Query epoch params from database
       res <- selectOne $ do
-        param <- from $ table @EpochParam
-        where_ (param ^. EpochParamEpochNo ==. val currentEpoch)
-        pure (param ^. EpochParamProtocolMajor)
+        param <- from $ table @Db.EpochParam
+        where_ (param ^. Db.EpochParamEpochNo ==. val currentEpoch)
+        pure (param ^. Db.EpochParamProtocolMajor)
 
       pure $ unValue <$> res
 
@@ -545,8 +524,8 @@ forkParam =
 
       -- Query proposals from database
       res <- selectOne $ do
-        prop <- from $ table @ParamProposal
-        where_ $ prop ^. ParamProposalEpochNo ==. val (Just currentEpoch)
-        pure (prop ^. ParamProposalProtocolMajor)
+        prop <- from $ table @Db.ParamProposal
+        where_ $ prop ^. Db.ParamProposalEpochNo ==. val (Just currentEpoch)
+        pure (prop ^. Db.ParamProposalProtocolMajor)
 
       pure $ join (unValue <$> res)

cardano-chain-gen/test/testfiles/fingerprint/conwayForkParam

@@ -1 +1 @@
-[2,7,10,12,19,24,26,27,35,37,39,61,70,74,75,84,99,101,103,112,120,125,136,137,138,141,146,151,166,180,188,205,207,215,216,226,234,235,246,253,261,272,275,279,284,285,287,299,307,311,314,315,318,321,341,345,353,355,361,362,366,367,372,377,379,389,391,393,396,401,403,410,427,435,455,460,465,470,484,486,487,488,497,499,506,510,511,512,516,519,520,523,530,532,537,540,550,558,559,571,579,581,583,600,604,605,607,610,613,621,630,631,651,658,665,669,678,679,687,692,693,696,698,699,712,725,728,742,758,765,774,775,778,787,789,792,794,796,801,804,808,815,816,818,821,828,837,841,842,851,853,863,866,873,880,883,885,886,896,901,903,904,909,911,914,915,918,920,927,931,932,938,949,956,966,976,981,983,988,994,996,999,1000,1002]
+[2,7,10,12,19,24,26,27,35,37,39,61,70,74,75,84,99,101,103,112,120,125,136,137,138,141,146,151,166,180,188,205,207,215,216,226,234,235,246,253,261,272,275,279,284,285,287,299,307,311,314,315,318,321,341,345,353,355,361,362,366,367,372,377,379,389,391,393,396,401,403,410,427,435,455,460,465,470,484,486,487,488,497,499,506,510,511,512,516,519,520,523,530,532,537,540,550,558,559,571,579,581,583,600,604,605,607,610,613,621,630,631,651,658,665,669,678,679,687,692,693,696,698,699,712,725,728,742,758,765,774,775,778,787,789,792,794,796,801,804,808,815,816,818,821,828,837,841,842,851,853,863,866,873,880,883,885,886,896,901,903,904,909,911,914,915,918,920,927,931,932,938,949,956,966,976,981,983,988,994,996,999,1018,1019]