Fix stylish

cardano-chain-gen/src/Cardano/Mock/ChainSync/Server.hs

@@ -31,8 +31,8 @@ import           Control.Concurrent (threadDelay)
 import           Control.Concurrent.Async
 import           Control.Exception (bracket)
 import           Control.Monad (forever)
-import           Control.Monad.Class.MonadSTM.Strict (STM, StrictTVar, newTVarIO)
-import           Control.Monad.Class.MonadSTM.Strict (modifyTVar, readTVar, writeTVar, MonadSTM(atomically), MonadSTMTx(retry) )
+import           Control.Monad.Class.MonadSTM.Strict (MonadSTM(atomically), STM, StrictTVar,
+                   MonadSTMTx(retry), modifyTVar, newTVarIO, readTVar, writeTVar)
 import           Control.Tracer (nullTracer)
 import           Data.Maybe (fromJust)
 import           Data.ByteString.Lazy.Char8 (ByteString)
@@ -52,8 +52,9 @@ import           Ouroboros.Consensus.Node (ConnectionId)
 import           Ouroboros.Consensus.Node.DbLock ()
 import           Ouroboros.Consensus.Node.DbMarker ()
 import           Ouroboros.Consensus.Node.InitStorage ()
-import           Ouroboros.Consensus.Node.NetworkProtocolVersion (latestReleasedNodeVersion)
-import           Ouroboros.Consensus.Node.NetworkProtocolVersion (BlockNodeToClientVersion, NodeToClientVersion, SupportedNetworkProtocolVersion, supportedNodeToClientVersions)
+import           Ouroboros.Consensus.Node.NetworkProtocolVersion (BlockNodeToClientVersion,
+                   NodeToClientVersion, SupportedNetworkProtocolVersion, latestReleasedNodeVersion,
+                   supportedNodeToClientVersions)
 import           Ouroboros.Consensus.Node.ProtocolInfo ()
 import           Ouroboros.Consensus.Node.Recovery ()
 import           Ouroboros.Consensus.Node.Run (SerialiseNodeToClientConstraints)
@@ -135,7 +136,7 @@ forkServerThread
 forkServerThread iom config initSt networkMagic path = do
     chainSt <- newTVarIO $ initChainProducerState config initSt
     thread <- async $ runLocalServer iom (configCodec config) networkMagic path chainSt
-    return $ ServerHandle chainSt thread
+    pure $ ServerHandle chainSt thread
 
 -- | Must be called from the main thread
 runLocalServer
@@ -156,7 +157,7 @@ runLocalServer iom codecConfig networkMagic localDomainSock chainProducerState =
              localSocket
              (versions chainProducerState)
              NodeToClient.networkErrorPolicies
-      return ()
+      pure ()
 
   where
     versions :: StrictTVar IO (ChainProducerState blk)
@@ -281,7 +282,7 @@ chainSyncServer state codec _blockVersion =
             let !cps' = updateFollower rid ipoint cps
             writeTVar state cps'
             let chain' = chainDB cps'
-            return (Just (castPoint ipoint), castTip (headTip chain'))
+            pure (Just (castPoint ipoint), castTip (headTip chain'))
 
     tryReadChainUpdate :: FollowerId
                        -> m (Maybe (Tip blk, ChainUpdate blk blk))

cardano-chain-gen/src/Cardano/Mock/ChainSync/State.hs

@@ -64,7 +64,7 @@ rollbackState :: (HasHeader block, HeaderHash block ~ HeaderHash block')
               -> Maybe (ChainProducerState block)
 rollbackState p (ChainProducerState c cflrst cfid) = do
     c' <- rollbackChainDB c (castPoint p)
-    return $ ChainProducerState c' (rollbackFollower <$> cflrst) cfid
+    pure (ChainProducerState c' (rollbackFollower <$> cflrst) cfid)
   where
     rollbackFollower flrst@FollowerState { followerPoint = p' }
       | Chain.pointIsAfter p' (castPoint p) (cchain c)

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

@@ -46,7 +46,7 @@ consPaymentTx ins outs fees =
       mempty
       Strict.SNothing
       Strict.SNothing
-      (Strict.SJust $ Testnet)
+      (Strict.SJust Testnet)
 
 mkPaymentTx :: LedgerState (ShelleyBlock (AlonzoEra StandardCrypto))
             -> Int -> Int -> Word64 -> Word64 -> ValidatedTx (AlonzoEra StandardCrypto)
@@ -85,7 +85,7 @@ emptyTxBody = TxBody
   mempty
   Strict.SNothing
   Strict.SNothing
-  (Strict.SJust $ Testnet)
+  (Strict.SJust Testnet)
 
 emptyTx :: ValidatedTx (AlonzoEra StandardCrypto)
 emptyTx = ValidatedTx

cardano-chain-gen/test/Main.hs

@@ -1,23 +1,25 @@
 import           Cardano.Prelude (Text)
 
-
-import           Test.Tasty
 import           Prelude
 
+import           Control.Monad ((>=>))
+
 import           MigrationValidations (KnownMigration (..), knownMigrations)
 
 import           Cardano.Mock.ChainSync.Server
 
+import           Test.Tasty
+
 import           Test.Cardano.Db.Mock.Unit
 
 main :: IO ()
 main =
-    withIOManager $ \iom ->
-        tests iom >>= defaultMain
+    withIOManager $
+        tests >=> defaultMain
 
 tests :: IOManager -> IO TestTree
 tests iom = do
-    return $
+    pure $
       testGroup
         "cardano-chain-gen"
           [ unitTests iom knownMigrationsPlain

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

@@ -50,7 +50,7 @@ setupTestsDir dir = do
 mkConfig :: FilePath -> FilePath -> IO Config
 mkConfig staticDir mutableDir = do
     config <- readSyncNodeConfig $ ConfigFile ( staticDir </> "test-db-sync-config.json")
-    genCfg <- either (error . Text.unpack . renderSyncNodeError) id <$> (runExceptT $ readCardanoGenesisConfig config)
+    genCfg <- either (error . Text.unpack . renderSyncNodeError) id <$> runExceptT (readCardanoGenesisConfig config)
     let pInfoDbSync = mkProtocolInfoCardano genCfg []
     creds <- mkShelleyCredentials $ staticDir </> "pools" </> "bulk1.creds"
     let pInfoForger = mkProtocolInfoCardano genCfg creds

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

@@ -1,5 +1,4 @@
 {-# LANGUAGE NumericUnderscores #-}
-{-# LANGUAGE TypeApplications #-}
 
 module Test.Cardano.Db.Mock.Unit where
 
@@ -120,16 +119,16 @@ simpleRollback = do
 bigChain :: IOManager -> [(Text, Text)] -> IO ()
 bigChain =
     withFullConfig configDir testDir $ \interpreter mockServer asyncDBSync -> do
-      blks <- forM (take 101 $ repeat mockBlock0) (forgeNext interpreter)
+      blks <- forM (replicate 101 mockBlock0) (forgeNext interpreter)
       atomically $ forM_ blks $ addBlock mockServer
       _ <- asyncDBSync
       assertBlockNoBackoff 100
 
-      blks' <- forM (take 100 $ repeat mockBlock1) (forgeNext interpreter)
+      blks' <- forM (replicate 100 mockBlock1) (forgeNext interpreter)
       atomically $ forM_ blks' $ addBlock mockServer
       assertBlockNoBackoff 200
 
-      blks'' <- forM (take 5 $ repeat mockBlock2) (forgeNext interpreter)
+      blks'' <- forM (replicate 5 mockBlock2) (forgeNext interpreter)
       atomically $ forM_ blks'' $ addBlock mockServer
       assertBlockNoBackoff 205
 
@@ -142,16 +141,16 @@ bigChain =
 bigChainRestart :: IOManager -> [(Text, Text)] -> IO ()
 bigChainRestart =
     withFullConfig configDir testDir $ \interpreter mockServer asyncDBSync -> do
-      blks <- forM (take 101 $ repeat mockBlock0) (forgeNext interpreter)
+      blks <- forM (replicate 101 mockBlock0) (forgeNext interpreter)
       atomically $ forM_ blks $ addBlock mockServer
       dbSync <- asyncDBSync
       assertBlockNoBackoff 100
 
-      blks' <- forM (take 100 $ repeat mockBlock1) (forgeNext interpreter)
+      blks' <- forM (replicate 10 mockBlock0) (forgeNext interpreter)
       atomically $ forM_ blks' $ addBlock mockServer
       assertBlockNoBackoff 200
 
-      blks'' <- forM (take 5 $ repeat mockBlock2) (forgeNext interpreter)
+      blks'' <- forM (replicate 5 mockBlock2) (forgeNext interpreter)
       atomically $ forM_ blks'' $ addBlock mockServer
       assertBlockNoBackoff 205
 

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Genesis.hs

@@ -1,12 +1,10 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
 module Cardano.DbSync.Era.Shelley.Genesis

cardano-db/src/Cardano/Db/Query.hs

@@ -194,7 +194,7 @@ queryBlockHeight = do
           orderBy [desc (blk ^. BlockBlockNo)]
           limit 1
           pure (blk ^. BlockBlockNo)
-  pure $ join $ unValue <$> listToMaybe res
+  pure $ (unValue =<< listToMaybe res)
 
 -- | Get the latest 'Block' associated with the given hash, skipping any EBBs.
 queryMainBlock :: MonadIO m => ByteString -> ReaderT SqlBackend m (Either LookupFail Block)