Merge pull request #69 from input-output-hk/nehwoggy/apply-stylish-ha…

…skell-to-project

Apply `stylish-haskell` to project

.github/workflows/check-stylish-haskell.yml

@@ -55,7 +55,11 @@ jobs:
 
         for x in $(git ls-tree --full-tree --name-only -r HEAD ${{ env.STYLISH_HASKELL_PATHS }}); do
           if [ "${x##*.}" == "hs" ]; then
-            stylish-haskell -i $x
+            if grep -qE '^#' $x; then
+              echo "$x contains CPP.  Skipping."
+            else
+              stylish-haskell -i $x
+            fi
           fi
         done
 
@@ -68,7 +72,11 @@ jobs:
         git fetch origin ${{ github.base_ref }} --unshallow
         for x in $(git diff --name-only origin/${{ github.base_ref }}..HEAD ${{ env.STYLISH_HASKELL_PATHS }}); do
           if [ "${x##*.}" == "hs" ]; then
-            stylish-haskell -i $x
+            if grep -qE '^#' $x; then
+              echo "$x contains CPP.  Skipping."
+            else
+              stylish-haskell -i $x
+            fi
           fi
         done
 

.github/workflows/github-page.yml

@@ -22,7 +22,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2022-12-30"
+      CABAL_CACHE_VERSION: "2023-07-11"
 
       # Modify this value to "invalidate" the secp cache.
       SECP_CACHE_VERSION: "2022-12-30"

.github/workflows/haskell.yml

@@ -17,7 +17,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-07-08"
+      CABAL_CACHE_VERSION: "2023-07-11"
 
     concurrency:
       group: >

cardano-cli/src/Cardano/CLI/Byron/Commands.hs

@@ -10,20 +10,18 @@ module Cardano.CLI.Byron.Commands
   , NewCertificateFile (..)
   ) where
 
-import           Data.String (IsString)
-
-import           Cardano.Chain.Update (InstallerHash (..), ProtocolVersion (..),
-                   SoftwareVersion (..), SystemTag (..))
-
 import           Cardano.Api hiding (GenesisParameters)
 import           Cardano.Api.Byron hiding (GenesisParameters)
 
+import           Cardano.Chain.Update (InstallerHash (..), ProtocolVersion (..),
+                   SoftwareVersion (..), SystemTag (..))
 import           Cardano.CLI.Byron.Genesis
 import           Cardano.CLI.Byron.Key
 import           Cardano.CLI.Byron.Tx
+import           Cardano.CLI.Shelley.Commands (ByronKeyFormat)
 import           Cardano.CLI.Types
 
-import           Cardano.CLI.Shelley.Commands (ByronKeyFormat)
+import           Data.String (IsString)
 
 data ByronCommand =
 

cardano-cli/src/Cardano/CLI/Byron/Delegation.hs

@@ -12,29 +12,28 @@ module Cardano.CLI.Byron.Delegation
   )
 where
 
-import           Prelude hiding ((.))
-
-import           Control.Category
-import           Control.Monad.Trans.Except.Extra (left)
-import qualified Data.ByteString.Lazy as LB
-import           Formatting (Format, sformat)
-
 import           Cardano.Api.Byron
 
-import           Cardano.Ledger.Binary (Annotated (..), serialize', byronProtVer)
 import qualified Cardano.Chain.Delegation as Dlg
 import           Cardano.Chain.Slotting (EpochNumber)
-import           Cardano.Crypto (ProtocolMagicId)
-import qualified Cardano.Crypto as Crypto
-
 import           Cardano.CLI.Byron.Key (ByronKeyFailure, renderByronKeyFailure)
 import           Cardano.CLI.Types (CertificateFile (..))
+import           Cardano.Crypto (ProtocolMagicId)
+import qualified Cardano.Crypto as Crypto
+import           Cardano.Ledger.Binary (Annotated (..), byronProtVer, serialize')
 import           Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
+
+import           Prelude hiding ((.))
+
+import           Control.Category
 import           Control.Monad (unless)
 import           Control.Monad.IO.Class (MonadIO (..))
 import           Control.Monad.Trans.Except (ExceptT)
+import           Control.Monad.Trans.Except.Extra (left)
 import           Data.ByteString (ByteString)
+import qualified Data.ByteString.Lazy as LB
 import           Data.Text (Text)
+import           Formatting (Format, sformat)
 
 data ByronDelegationError
   = CertificateValidationErrors !FilePath ![Text]

cardano-cli/src/Cardano/CLI/Byron/Genesis.hs

@@ -12,6 +12,19 @@ module Cardano.CLI.Byron.Genesis
   )
 where
 
+import           Cardano.Api (Key (..), NetworkId, textShow, writeSecrets)
+import           Cardano.Api.Byron (ByronKey, SerialiseAsRawBytes (..), SigningKey (..),
+                   toByronRequiresNetworkMagic)
+
+import qualified Cardano.Chain.Common as Common
+import           Cardano.Chain.Delegation hiding (Map, epoch)
+import           Cardano.Chain.Genesis (GeneratedSecrets (..))
+import qualified Cardano.Chain.Genesis as Genesis
+import qualified Cardano.Chain.UTxO as UTxO
+import           Cardano.CLI.Byron.Delegation
+import           Cardano.CLI.Byron.Key
+import           Cardano.CLI.Types (GenesisFile (..))
+import qualified Cardano.Crypto as Crypto
 import           Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
 
 import           Control.Monad.IO.Class (MonadIO (..))
@@ -30,25 +43,8 @@ import           Data.Text.Lazy (toStrict)
 import           Data.Text.Lazy.Builder (toLazyText)
 import           Data.Time (UTCTime)
 import           Formatting.Buildable
-
-import           Cardano.Api (Key (..), NetworkId, textShow, writeSecrets)
-
-import           Cardano.Api.Byron (ByronKey, SerialiseAsRawBytes (..), SigningKey (..),
-                   toByronRequiresNetworkMagic)
 import           System.Directory (createDirectory, doesPathExist)
 
-import qualified Cardano.Chain.Common as Common
-import           Cardano.Chain.Delegation hiding (Map, epoch)
-import           Cardano.Chain.Genesis (GeneratedSecrets (..))
-import qualified Cardano.Chain.Genesis as Genesis
-import qualified Cardano.Chain.UTxO as UTxO
-
-import qualified Cardano.Crypto as Crypto
-
-import           Cardano.CLI.Byron.Delegation
-import           Cardano.CLI.Byron.Key
-import           Cardano.CLI.Types (GenesisFile (..))
-
 data ByronGenesisError
   = ByronDelegationCertSerializationError !ByronDelegationError
   | ByronDelegationKeySerializationError ByronDelegationError

cardano-cli/src/Cardano/CLI/Byron/Key.hs

@@ -15,6 +15,13 @@ module Cardano.CLI.Byron.Key
   )
 where
 
+import           Cardano.Api.Byron
+
+import qualified Cardano.Chain.Common as Common
+import           Cardano.CLI.Shelley.Commands (ByronKeyFormat (..))
+import           Cardano.CLI.Types
+import qualified Cardano.Crypto.Signing as Crypto
+
 import           Control.Exception (Exception (..))
 import           Control.Monad.Trans.Except (ExceptT)
 import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither, left,
@@ -26,13 +33,6 @@ import           Data.Text (Text)
 import qualified Data.Text as T
 import           Formatting (build, sformat, (%))
 
-import           Cardano.Api.Byron
-
-import qualified Cardano.Chain.Common as Common
-import           Cardano.CLI.Shelley.Commands (ByronKeyFormat (..))
-import           Cardano.CLI.Types
-import qualified Cardano.Crypto.Signing as Crypto
-
 
 data ByronKeyFailure
   = ReadSigningKeyFailure !FilePath !Text

cardano-cli/src/Cardano/CLI/Byron/Legacy.hs

@@ -9,18 +9,17 @@ module Cardano.CLI.Byron.Legacy (
     , decodeLegacyDelegateKey
     ) where
 
-import           Cardano.Prelude (cborError)
+import           Cardano.Api (textShow)
 
-import           Control.Monad (when)
-import           Formatting (build, formatToString)
+import           Cardano.Crypto.Signing (SigningKey (..))
+import qualified Cardano.Crypto.Wallet as Wallet
+import           Cardano.Prelude (cborError)
 
 import qualified Codec.CBOR.Decoding as D
 import qualified Codec.CBOR.Encoding as E
-
-import           Cardano.Api (textShow)
-import           Cardano.Crypto.Signing (SigningKey (..))
-import qualified Cardano.Crypto.Wallet as Wallet
+import           Control.Monad (when)
 import           Data.Text (Text)
+import           Formatting (build, formatToString)
 
 
 -- | LegacyDelegateKey is a subset of the UserSecret's from the legacy codebase:

cardano-cli/src/Cardano/CLI/Byron/Query.hs

@@ -10,7 +10,6 @@ module Cardano.CLI.Byron.Query
 import           Cardano.Api
 
 import           Data.Aeson.Encode.Pretty (encodePretty)
-
 import qualified Data.ByteString.Lazy as LB
 import qualified Data.Text.Encoding as Text
 import qualified Data.Text.IO as Text

cardano-cli/src/Cardano/CLI/Byron/Run.hs

@@ -7,29 +7,10 @@ module Cardano.CLI.Byron.Run
   , runByronClientCommand
   ) where
 
-import           Control.Monad.IO.Class (MonadIO (liftIO))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither, left)
-import           Data.Bifunctor (Bifunctor (..))
-import qualified Data.ByteString.Char8 as BS
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.IO as Text
-import qualified Data.Text.Lazy.Builder as Builder
-import qualified Data.Text.Lazy.IO as TL
-import qualified Formatting as F
-
-import qualified Cardano.Chain.Genesis as Genesis
-
-import qualified Cardano.Crypto.Hashing as Crypto
-import qualified Cardano.Crypto.Signing as Crypto
-
 import           Cardano.Api hiding (GenesisParameters, UpdateProposal)
 import           Cardano.Api.Byron (SomeByronSigningKey (..), Tx (..))
 
-import           Ouroboros.Consensus.Byron.Ledger (ByronBlock)
-import           Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr)
-
+import qualified Cardano.Chain.Genesis as Genesis
 import           Cardano.CLI.Byron.Commands
 import           Cardano.CLI.Byron.Delegation
 import           Cardano.CLI.Byron.Genesis
@@ -41,6 +22,22 @@ import           Cardano.CLI.Byron.Vote
 import           Cardano.CLI.Helpers
 import           Cardano.CLI.Shelley.Commands (ByronKeyFormat (..))
 import           Cardano.CLI.Types
+import qualified Cardano.Crypto.Hashing as Crypto
+import qualified Cardano.Crypto.Signing as Crypto
+import           Ouroboros.Consensus.Byron.Ledger (ByronBlock)
+import           Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr)
+
+import           Control.Monad.IO.Class (MonadIO (liftIO))
+import           Control.Monad.Trans.Except (ExceptT)
+import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither, left)
+import           Data.Bifunctor (Bifunctor (..))
+import qualified Data.ByteString.Char8 as BS
+import           Data.Text (Text)
+import qualified Data.Text as Text
+import qualified Data.Text.IO as Text
+import qualified Data.Text.Lazy.Builder as Builder
+import qualified Data.Text.Lazy.IO as TL
+import qualified Formatting as F
 
 -- | Data type that encompasses all the possible errors of the
 -- Byron client.

cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs

@@ -9,32 +9,29 @@ module Cardano.CLI.Byron.UpdateProposal
   , submitByronUpdateProposal
   ) where
 
-import           Cardano.Prelude (ConvertText (..))
-
-import           Control.Exception (Exception (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither)
-import           Control.Tracer (stdoutTracer, traceWith)
-import           Data.Bifunctor (Bifunctor (..))
-import qualified Data.ByteString as BS
-import           Data.Text (Text)
-
-import           Cardano.Chain.Update (InstallerHash (..), ProtocolVersion (..),
-                   SoftwareVersion (..), SystemTag (..))
-
-import           Ouroboros.Consensus.Ledger.SupportsMempool (txId)
-import           Ouroboros.Consensus.Util.Condense (condense)
-
 import           Cardano.Api (NetworkId, SerialiseAsRawBytes (..), SocketPath, textShow)
 import           Cardano.Api.Byron (AsType (AsByronUpdateProposal), ByronProtocolParametersUpdate,
                    ByronUpdateProposal, makeByronUpdateProposal, toByronLedgerUpdateProposal)
 
+import           Cardano.Chain.Update (InstallerHash (..), ProtocolVersion (..),
+                   SoftwareVersion (..), SystemTag (..))
 import           Cardano.CLI.Byron.Genesis (ByronGenesisError)
 import           Cardano.CLI.Byron.Key (ByronKeyFailure, readByronSigningKey)
 import           Cardano.CLI.Byron.Tx (ByronTxError, nodeSubmitTx)
 import           Cardano.CLI.Helpers (HelpersError, ensureNewFileLBS, renderHelpersError)
 import           Cardano.CLI.Shelley.Commands (ByronKeyFormat (..))
 import           Cardano.CLI.Types
+import           Cardano.Prelude (ConvertText (..))
+import           Ouroboros.Consensus.Ledger.SupportsMempool (txId)
+import           Ouroboros.Consensus.Util.Condense (condense)
+
+import           Control.Exception (Exception (..))
+import           Control.Monad.Trans.Except (ExceptT)
+import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither)
+import           Control.Tracer (stdoutTracer, traceWith)
+import           Data.Bifunctor (Bifunctor (..))
+import qualified Data.ByteString as BS
+import           Data.Text (Text)
 
 data ByronUpdateProposalError
   = ByronReadUpdateProposalFileFailure !FilePath !Text

cardano-cli/src/Cardano/CLI/Byron/Vote.hs

@@ -9,29 +9,28 @@ module Cardano.CLI.Byron.Vote
   , submitByronVote
   ) where
 
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither)
-import           Control.Tracer (stdoutTracer, traceWith)
-import qualified Data.ByteString as BS
-import           Data.Text (Text)
-import qualified Data.Text as Text
-
-import qualified Cardano.Binary as Binary
-import           Cardano.CLI.Byron.UpdateProposal (ByronUpdateProposalError,
-                   readByronUpdateProposal)
-import           Ouroboros.Consensus.Ledger.SupportsMempool (txId)
-import           Ouroboros.Consensus.Util.Condense (condense)
-
 import           Cardano.Api.Byron
 
+import qualified Cardano.Binary as Binary
 import           Cardano.CLI.Byron.Genesis (ByronGenesisError)
 import           Cardano.CLI.Byron.Key (ByronKeyFailure, readByronSigningKey)
 import           Cardano.CLI.Byron.Tx (ByronTxError, nodeSubmitTx)
+import           Cardano.CLI.Byron.UpdateProposal (ByronUpdateProposalError,
+                   readByronUpdateProposal)
 import           Cardano.CLI.Helpers (HelpersError, ensureNewFileLBS)
 import           Cardano.CLI.Shelley.Commands (ByronKeyFormat (..))
 import           Cardano.CLI.Types
+import           Ouroboros.Consensus.Ledger.SupportsMempool (txId)
+import           Ouroboros.Consensus.Util.Condense (condense)
+
 import           Control.Monad.IO.Class (MonadIO (..))
+import           Control.Monad.Trans.Except (ExceptT)
+import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither)
+import           Control.Tracer (stdoutTracer, traceWith)
 import           Data.Bifunctor (first)
+import qualified Data.ByteString as BS
+import           Data.Text (Text)
+import qualified Data.Text as Text
 
 
 data ByronVoteError

cardano-cli/src/Cardano/CLI/Conway/Commands.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE LambdaCase #-}
 
 module Cardano.CLI.Conway.Commands where
 
@@ -10,18 +10,17 @@ import           Cardano.Api.Shelley
 import           Cardano.Binary (DecoderError)
 import           Cardano.CLI.Conway.Types
 import           Cardano.CLI.Shelley.Key
+import           Cardano.CLI.Shelley.Run.Read (CddlError)
 import           Cardano.CLI.Shelley.Run.StakeAddress
 
 import           Control.Monad.IO.Class
 import           Control.Monad.Trans.Except (ExceptT)
 import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither, newExceptT)
 import           Data.Bifunctor
 import qualified Data.ByteString as BS
+import           Data.Text (Text)
 import qualified Data.Text.Encoding as Text
 import           Data.Text.Encoding.Error
-import           Data.Text(Text)
-
-import           Cardano.CLI.Shelley.Run.Read (CddlError)
 
 data GovernanceCmdError
   = -- Voting related
@@ -125,7 +124,7 @@ runGovernanceCreateActionCmd
 runGovernanceCreateActionCmd anyEra deposit depositReturnAddr govAction oFp = do
   AnyShelleyBasedEra sbe <- pure anyEra
   let proposal = createProposalProcedure sbe deposit depositReturnAddr govAction
-  
+
   firstExceptT WriteFileError . newExceptT
     $ obtainEraPParamsConstraint sbe
     $ writeFileTextEnvelope oFp Nothing proposal