move queryTableCount to Validate.hs + removed code + hlint

Author: Cmdv

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

@@ -93,16 +93,6 @@ queryStakeAddressHashRaw = do
     pure $ stakeAddress ^. Db.StakeAddressHashRaw
   pure $ toShort . Base16.encode . unValue <$> res
 
--- queryTableCount ::
---   (MonadIO m, PersistEntity table, PersistEntityBackend table ~ SqlBackend)
---   => (SqlExpr (Entity table) -> SqlQuery ())
---   -> m Word
--- queryTableCount _ = do
---   res <- selectOne $ do
---     _ <- from (table @table) -- using TypeApplications to generalize the table
---     pure countRows
---   pure $ maybe 0 unValue res
-
 queryStakeAddressCount :: MonadIO io => ReaderT SqlBackend io Word
 queryStakeAddressCount = do
   res <- selectOne $ do

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

@@ -42,7 +42,6 @@ module Test.Cardano.Db.Mock.Config (
   withCustomConfigAndLogs,
   withFullConfig',
   replaceConfigFile,
-  expectFailSilent,
 ) where
 
 import Cardano.Api (NetworkMagic (..))
@@ -67,7 +66,7 @@ import Control.Concurrent.STM.TMVar (
   tryPutTMVar,
   tryReadTMVar,
  )
-import Control.Exception (SomeException, bracket, catch)
+import Control.Exception (SomeException, bracket)
 import Control.Monad (void)
 import Control.Monad.Extra (eitherM)
 import Control.Monad.Logger (NoLoggingT, runNoLoggingT)
@@ -85,8 +84,6 @@ import Ouroboros.Consensus.Shelley.Node (ShelleyLeaderCredentials)
 import System.Directory (createDirectoryIfMissing, removePathForcibly)
 import System.FilePath.Posix (takeDirectory, (</>))
 import System.IO.Silently (hSilence)
-import Test.Tasty (TestTree)
-import Test.Tasty.HUnit (Assertion, assertFailure, testCase)
 
 data Config = Config
   { topLevelConfig :: TopLevelConfig CardanoBlock
@@ -519,10 +516,3 @@ replaceConfigFile newFilename dbSync@DBSyncEnv {..} = do
     configDir = mkConfigDir . takeDirectory . unConfigFile . enpConfigFile $ dbSyncParams
     newParams =
       dbSyncParams {enpConfigFile = ConfigFile $ configDir </> newFilename}
-
-expectFailSilent :: String -> Assertion -> TestTree
-expectFailSilent name action = testCase name $ do
-  result <- catch (Right <$> action) (\(_ :: SomeException) -> pure $ Left ())
-  case result of
-    Left _ -> pure () -- Test failed as expected, do nothing
-    Right _ -> assertFailure "Expected test to fail but it succeeded"

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

@@ -11,7 +11,6 @@ import Data.Text (Text)
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.HUnit (Assertion, testCase)
 
-import Test.Cardano.Db.Mock.Config (expectFailSilent)
 import qualified Test.Cardano.Db.Mock.Unit.Babbage.CommandLineArg.ConfigFile as ConfigFile
 import qualified Test.Cardano.Db.Mock.Unit.Babbage.CommandLineArg.EpochDisabled as EpochDisabled
 import qualified Test.Cardano.Db.Mock.Unit.Babbage.CommandLineArg.ForceIndex as ForceIndex
@@ -25,6 +24,7 @@ import qualified Test.Cardano.Db.Mock.Unit.Babbage.Rollback as BabRollback
 import qualified Test.Cardano.Db.Mock.Unit.Babbage.Simple as BabSimple
 import qualified Test.Cardano.Db.Mock.Unit.Babbage.Stake as BabStake
 import qualified Test.Cardano.Db.Mock.Unit.Babbage.Tx as BabTx
+import Test.Cardano.Db.Mock.Validate (expectFailSilent)
 
 unitTests :: IOManager -> [(Text, Text)] -> TestTree
 unitTests iom knownMigrations =

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

@@ -2,7 +2,6 @@ module Test.Cardano.Db.Mock.Unit.Conway (unitTests) where
 
 import Cardano.Mock.ChainSync.Server (IOManager ())
 import Cardano.Prelude
-import Test.Cardano.Db.Mock.Config (expectFailSilent)
 import qualified Test.Cardano.Db.Mock.Unit.Conway.CommandLineArg.ConfigFile as ConfigFile
 import qualified Test.Cardano.Db.Mock.Unit.Conway.CommandLineArg.EpochDisabled as EpochDisabled
 import qualified Test.Cardano.Db.Mock.Unit.Conway.CommandLineArg.ForceIndex as ForceIndex
@@ -17,6 +16,7 @@ import qualified Test.Cardano.Db.Mock.Unit.Conway.Simple as Simple
 import qualified Test.Cardano.Db.Mock.Unit.Conway.Stake as Stake
 import qualified Test.Cardano.Db.Mock.Unit.Conway.Tx as Tx
 import qualified Test.Cardano.Db.Mock.Unit.Conway.Whitelist as Whitelist
+import Test.Cardano.Db.Mock.Validate (expectFailSilent)
 import Test.Tasty (TestTree (), testGroup)
 import Test.Tasty.HUnit (Assertion (), testCase)
 import Prelude (String ())

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

@@ -17,6 +17,7 @@ module Test.Cardano.Db.Mock.Validate (
   assertRewardRestCount,
   assertBlockNoBackoff,
   assertBlockNoBackoffTimes,
+  expectFailSilent,
   assertEqQuery,
   assertEqBackoff,
   assertBackoff,
@@ -39,7 +40,8 @@ module Test.Cardano.Db.Mock.Validate (
   assertPoolCounters,
   poolCountersQuery,
   checkStillRuns,
-) where
+)
+where
 
 import Cardano.Db
 import qualified Cardano.Db as DB
@@ -85,7 +87,8 @@ import Database.PostgreSQL.Simple (SqlError (..))
 import Ouroboros.Consensus.Cardano.Block
 import Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock)
 import Test.Cardano.Db.Mock.Config
-import Test.Tasty.HUnit (assertEqual, assertFailure)
+import Test.Tasty (TestTree)
+import Test.Tasty.HUnit (Assertion, assertEqual, assertFailure, testCase)
 
 {- HLINT ignore "Reduce duplication" -}
 
@@ -124,6 +127,13 @@ assertBlockNoBackoffTimes :: [Int] -> DBSyncEnv -> Int -> IO ()
 assertBlockNoBackoffTimes times env blockNo =
   assertEqBackoff env DB.queryBlockHeight (Just $ fromIntegral blockNo) times "Unexpected BlockNo"
 
+expectFailSilent :: String -> Assertion -> TestTree
+expectFailSilent name action = testCase name $ do
+  result <- catch (Right <$> action) (\(_ :: SomeException) -> pure $ Left ())
+  case result of
+    Left _ -> pure () -- Test failed as expected, do nothing
+    Right _ -> assertFailure "Expected test to fail but it succeeded"
+
 -- checking that unspent count matches from tx_in to tx_out
 assertUnspentTx :: DBSyncEnv -> IO ()
 assertUnspentTx syncEnv = do
@@ -207,7 +217,7 @@ assertAddrValues env ix expected sta = do
       q = queryAddressOutputs address
   assertEqBackoff env q expected defaultDelays "Unexpected Balance"
 
-assertRight :: Show err => Either err a -> IO a
+assertRight :: (Show err) => Either err a -> IO a
 assertRight ei =
   case ei of
     Right a -> pure a
@@ -234,7 +244,7 @@ assertCertCounts env expected =
       pure (registr - 5, deregistr, deleg - 5, withdrawal)
 
 assertRewardCounts ::
-  EraCrypto era ~ StandardCrypto =>
+  (EraCrypto era ~ StandardCrypto) =>
   DBSyncEnv ->
   LedgerState (ShelleyBlock p era) ->
   Bool ->
@@ -468,11 +478,11 @@ poolCountersQuery = do
       <$> (select . from $ \(_a :: SqlExpr (Entity PoolRelay)) -> pure countRows)
   pure (poolHash, poolMetadataRef, poolUpdate, poolOwner, poolRetire, poolRelay)
 
-addPoolCounters :: Num a => (a, a, a, a, a, a) -> (a, a, a, a, a, a) -> (a, a, a, a, a, a)
+addPoolCounters :: (Num a) => (a, a, a, a, a, a) -> (a, a, a, a, a, a) -> (a, a, a, a, a, a)
 addPoolCounters (a, b, c, d, e, f) (a', b', c', d', e', f') = (a + a', b + b', c + c', d + d', e + e', f + f')
 
 assertPoolLayerCounters ::
-  EraCrypto era ~ StandardCrypto =>
+  (EraCrypto era ~ StandardCrypto) =>
   DBSyncEnv ->
   (Word64, Word64) ->
   [(PoolIndex, (Either DBFail Bool, Bool, Bool))] ->

cardano-db-sync/src/Cardano/DbSync/Config/Types.hs

@@ -68,7 +68,7 @@ import qualified Data.Aeson as Aeson
 import Data.Aeson.Types (Parser, typeMismatch)
 import Data.ByteString.Short (ShortByteString (), fromShort, toShort)
 import Data.Default.Class (Default (..))
-import qualified Data.Text as T
+import qualified Data.Text as Text
 import Ouroboros.Consensus.Cardano.CanHardFork (TriggerHardFork (..))
 
 newtype LogFileDir = LogFileDir
@@ -607,7 +607,7 @@ enableDisableToBool = \case
 
 parseValidateHash :: Text -> Parser ShortByteString
 parseValidateHash txt =
-  if "\\x" `T.isPrefixOf` txt
+  if "\\x" `Text.isPrefixOf` txt
     then fail $ "Invalid Hash: starts with \\x please adjust it:  " <> show txt
     else pure $ toShort $ encodeUtf8 txt