Skip to content

Commit

Permalink
Reformat codebase with only fourmolu
Browse files Browse the repository at this point in the history
  • Loading branch information
carbolymer committed Feb 18, 2025
1 parent db72730 commit 8cae5c1
Show file tree
Hide file tree
Showing 256 changed files with 2,829 additions and 2,631 deletions.
14 changes: 7 additions & 7 deletions cardano-cli/src/Cardano/CLI/Byron/Commands.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ module Cardano.CLI.Byron.Commands
)
where

import Cardano.Api hiding (GenesisParameters)
import qualified Cardano.Api.Byron as Byron
import Cardano.Api hiding (GenesisParameters)
import Cardano.Api.Byron qualified as Byron

import Cardano.CLI.Byron.Genesis
import Cardano.CLI.Byron.Key
import Cardano.CLI.Byron.Tx
import Cardano.CLI.Types.Common
import Cardano.CLI.Byron.Genesis
import Cardano.CLI.Byron.Key
import Cardano.CLI.Byron.Tx
import Cardano.CLI.Types.Common

import Data.String (IsString)
import Data.String (IsString)

data ByronCommand
= --- Node Related Commands ---
Expand Down
36 changes: 18 additions & 18 deletions cardano-cli/src/Cardano/CLI/Byron/Delegation.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ module Cardano.CLI.Byron.Delegation
)
where

import Cardano.Api.Byron (ACertificate (delegateVK))
import Cardano.Api.Byron hiding (delegateVK)
import qualified Cardano.Api.Ledger as L

import Cardano.CLI.Byron.Key (ByronKeyFailure, renderByronKeyFailure)
import Cardano.CLI.Types.Common (CertificateFile (..))
import Cardano.Crypto (ProtocolMagicId)
import qualified Cardano.Crypto as Crypto
import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)

import Prelude hiding ((.))

import Control.Category
import Control.Monad (unless)
import Data.ByteString (ByteString)
import qualified Data.ByteString.Lazy as LB
import Data.Text (Text)
import Formatting (Format, sformat)
import Cardano.Api.Byron (ACertificate (delegateVK))
import Cardano.Api.Byron hiding (delegateVK)
import Cardano.Api.Ledger qualified as L

import Cardano.CLI.Byron.Key (ByronKeyFailure, renderByronKeyFailure)
import Cardano.CLI.Types.Common (CertificateFile (..))
import Cardano.Crypto (ProtocolMagicId)
import Cardano.Crypto qualified as Crypto
import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)

import Prelude hiding ((.))

import Control.Category
import Control.Monad (unless)
import Data.ByteString (ByteString)
import Data.ByteString.Lazy qualified as LB
import Data.Text (Text)
import Formatting (Format, sformat)

data ByronDelegationError
= CertificateValidationErrors !FilePath ![Text]
Expand Down
58 changes: 31 additions & 27 deletions cardano-cli/src/Cardano/CLI/Byron/Genesis.hs
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,37 @@ module Cardano.CLI.Byron.Genesis
)
where

import Cardano.Api (Doc, Key (..), NetworkId, pretty, pshow, writeSecrets)
import Cardano.Api.Byron (ByronKey, SerialiseAsRawBytes (..), SigningKey (..),
toByronRequiresNetworkMagic)
import qualified Cardano.Api.Byron as Byron

import Cardano.CLI.Byron.Delegation
import Cardano.CLI.Byron.Key
import Cardano.CLI.Types.Common (GenesisFile (..))
import qualified Cardano.Crypto as Crypto
import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)

import Control.Monad.IO.Class
import Control.Monad.Trans (MonadTrans (..))
import Control.Monad.Trans.Except (ExceptT (..), withExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, left, right)
import Data.ByteString (ByteString)
import qualified Data.ByteString.Lazy as LB
import qualified Data.List as List
import qualified Data.Map.Strict as Map
import Data.String (IsString)
import Data.Text (Text)
import qualified Data.Text.Encoding as Text
import Data.Text.Lazy (toStrict)
import Data.Text.Lazy.Builder (toLazyText)
import Data.Time (UTCTime)
import Formatting.Buildable
import System.Directory (createDirectory, doesPathExist)
import Cardano.Api (Doc, Key (..), NetworkId, pretty, pshow, writeSecrets)
import Cardano.Api.Byron
( ByronKey
, SerialiseAsRawBytes (..)
, SigningKey (..)
, toByronRequiresNetworkMagic
)
import Cardano.Api.Byron qualified as Byron

import Cardano.CLI.Byron.Delegation
import Cardano.CLI.Byron.Key
import Cardano.CLI.Types.Common (GenesisFile (..))
import Cardano.Crypto qualified as Crypto
import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)

import Control.Monad.IO.Class
import Control.Monad.Trans (MonadTrans (..))
import Control.Monad.Trans.Except (ExceptT (..), withExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, left, right)
import Data.ByteString (ByteString)
import Data.ByteString.Lazy qualified as LB
import Data.List qualified as List
import Data.Map.Strict qualified as Map
import Data.String (IsString)
import Data.Text (Text)
import Data.Text.Encoding qualified as Text
import Data.Text.Lazy (toStrict)
import Data.Text.Lazy.Builder (toLazyText)
import Data.Time (UTCTime)
import Formatting.Buildable
import System.Directory (createDirectory, doesPathExist)

data ByronGenesisError
= ByronDelegationCertSerializationError !ByronDelegationError
Expand Down
20 changes: 10 additions & 10 deletions cardano-cli/src/Cardano/CLI/Byron/Key.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ module Cardano.CLI.Byron.Key
)
where

import Cardano.Api.Byron
import Cardano.Api.Byron

import Cardano.CLI.Types.Common
import qualified Cardano.Crypto.Signing as Crypto
import Cardano.CLI.Types.Common
import Cardano.Crypto.Signing qualified as Crypto

import Control.Exception (Exception (..))
import qualified Data.ByteString as SB
import qualified Data.ByteString.UTF8 as UTF8
import Data.String (IsString, fromString)
import Data.Text (Text)
import qualified Data.Text as T
import Formatting (build, sformat, (%))
import Control.Exception (Exception (..))
import Data.ByteString qualified as SB
import Data.ByteString.UTF8 qualified as UTF8
import Data.String (IsString, fromString)
import Data.Text (Text)
import Data.Text qualified as T
import Formatting (build, sformat, (%))

data ByronKeyFailure
= ReadSigningKeyFailure !FilePath !Text
Expand Down
16 changes: 8 additions & 8 deletions cardano-cli/src/Cardano/CLI/Byron/Legacy.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ module Cardano.CLI.Byron.Legacy
)
where

import Cardano.Api (textShow)
import Cardano.Api (textShow)

import Cardano.Crypto.Signing (SigningKey (..))
import qualified Cardano.Crypto.Wallet as Wallet
import Cardano.Crypto.Signing (SigningKey (..))
import Cardano.Crypto.Wallet qualified as Wallet

import qualified Codec.CBOR.Decoding as D
import qualified Codec.CBOR.Encoding as E
import Control.Monad (when)
import Data.Text (Text)
import Formatting (build, formatToString)
import Codec.CBOR.Decoding qualified as D
import Codec.CBOR.Encoding qualified as E
import Control.Monad (when)
import Data.Text (Text)
import Formatting (build, formatToString)

-- | LegacyDelegateKey is a subset of the UserSecret's from the legacy codebase:
-- 1. the VSS keypair must be present
Expand Down
75 changes: 39 additions & 36 deletions cardano-cli/src/Cardano/CLI/Byron/Parsers.hs
Original file line number Diff line number Diff line change
Expand Up @@ -24,42 +24,45 @@ module Cardano.CLI.Byron.Parsers
)
where

import Cardano.Api hiding (GenesisParameters, UpdateProposal)
import Cardano.Api.Byron (ByronProtocolParametersUpdate (..), toByronLovelace)
import qualified Cardano.Api.Byron as Byron
import qualified Cardano.Api.Ledger as L
import Cardano.Api.Shelley (ReferenceScript (ReferenceScriptNone))

import Cardano.CLI.Byron.Commands
import Cardano.CLI.Byron.Genesis
import Cardano.CLI.Byron.Key
import Cardano.CLI.Byron.Tx
import Cardano.CLI.Environment (EnvCli (..))
import Cardano.CLI.EraBased.Options.Common hiding (parseLovelace, parseTxIn)
import Cardano.CLI.Run (ClientCommand (ByronCommand))
import Cardano.CLI.Types.Common
import Cardano.Crypto (RequiresNetworkMagic (..))
import Cardano.Crypto.Hashing (hashRaw)
import Cardano.Crypto.ProtocolMagic (AProtocolMagic (..), ProtocolMagic,
ProtocolMagicId (..))

import Control.Monad (when)
import qualified Data.Attoparsec.ByteString.Char8 as Atto
import Data.Attoparsec.Combinator ((<?>))
import qualified Data.ByteString.Char8 as BSC
import qualified Data.ByteString.Lazy.Char8 as C8
import qualified Data.Char as Char
import Data.Foldable
import Data.Text (Text)
import qualified Data.Text as Text
import Data.Time (UTCTime)
import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
import Data.Word (Word16, Word64)
import Formatting (build, sformat)
import GHC.Natural (Natural)
import GHC.Word (Word8)
import Options.Applicative
import qualified Options.Applicative as Opt
import Cardano.Api hiding (GenesisParameters, UpdateProposal)
import Cardano.Api.Byron (ByronProtocolParametersUpdate (..), toByronLovelace)
import Cardano.Api.Byron qualified as Byron
import Cardano.Api.Ledger qualified as L
import Cardano.Api.Shelley (ReferenceScript (ReferenceScriptNone))

import Cardano.CLI.Byron.Commands
import Cardano.CLI.Byron.Genesis
import Cardano.CLI.Byron.Key
import Cardano.CLI.Byron.Tx
import Cardano.CLI.Environment (EnvCli (..))
import Cardano.CLI.EraBased.Options.Common hiding (parseLovelace, parseTxIn)
import Cardano.CLI.Run (ClientCommand (ByronCommand))
import Cardano.CLI.Types.Common
import Cardano.Crypto (RequiresNetworkMagic (..))
import Cardano.Crypto.Hashing (hashRaw)
import Cardano.Crypto.ProtocolMagic
( AProtocolMagic (..)
, ProtocolMagic
, ProtocolMagicId (..)
)

import Control.Monad (when)
import Data.Attoparsec.ByteString.Char8 qualified as Atto
import Data.Attoparsec.Combinator ((<?>))
import Data.ByteString.Char8 qualified as BSC
import Data.ByteString.Lazy.Char8 qualified as C8
import Data.Char qualified as Char
import Data.Foldable
import Data.Text (Text)
import Data.Text qualified as Text
import Data.Time (UTCTime)
import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
import Data.Word (Word16, Word64)
import Formatting (build, sformat)
import GHC.Natural (Natural)
import GHC.Word (Word8)
import Options.Applicative
import Options.Applicative qualified as Opt

backwardsCompatibilityCommands :: EnvCli -> Parser ClientCommand
backwardsCompatibilityCommands envCli =
Expand Down
46 changes: 23 additions & 23 deletions cardano-cli/src/Cardano/CLI/Byron/Run.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@ module Cardano.CLI.Byron.Run
)
where

import Cardano.Api hiding (GenesisParameters, UpdateProposal)
import Cardano.Api.Byron (SomeByronSigningKey (..), serializeByronTx)
import qualified Cardano.Api.Byron as Byron

import Cardano.CLI.Byron.Commands
import Cardano.CLI.Byron.Delegation
import Cardano.CLI.Byron.Genesis
import Cardano.CLI.Byron.Key
import Cardano.CLI.Byron.Tx
import Cardano.CLI.Byron.UpdateProposal
import Cardano.CLI.Byron.Vote
import Cardano.CLI.Helpers
import Cardano.CLI.Types.Common
import qualified Cardano.Crypto.Hashing as Crypto
import qualified Cardano.Crypto.Signing as Crypto

import Data.Bifunctor (Bifunctor (..))
import qualified Data.ByteString.Char8 as BS
import Data.Text (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 Cardano.Api hiding (GenesisParameters, UpdateProposal)
import Cardano.Api.Byron (SomeByronSigningKey (..), serializeByronTx)
import Cardano.Api.Byron qualified as Byron

import Cardano.CLI.Byron.Commands
import Cardano.CLI.Byron.Delegation
import Cardano.CLI.Byron.Genesis
import Cardano.CLI.Byron.Key
import Cardano.CLI.Byron.Tx
import Cardano.CLI.Byron.UpdateProposal
import Cardano.CLI.Byron.Vote
import Cardano.CLI.Helpers
import Cardano.CLI.Types.Common
import Cardano.Crypto.Hashing qualified as Crypto
import Cardano.Crypto.Signing qualified as Crypto

import Data.Bifunctor (Bifunctor (..))
import Data.ByteString.Char8 qualified as BS
import Data.Text (Text)
import Data.Text.IO qualified as Text
import Data.Text.Lazy.Builder qualified as Builder
import Data.Text.Lazy.IO qualified as TL
import Formatting qualified as F

-- | Data type that encompasses all the possible errors of the
-- Byron client.
Expand Down
52 changes: 26 additions & 26 deletions cardano-cli/src/Cardano/CLI/Byron/Tx.hs
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,32 @@ module Cardano.CLI.Byron.Tx
)
where

import Cardano.Api
import qualified Cardano.Api.Byron as Byron
import Cardano.Api.Consensus (ByronBlock, EraMismatch (..), GenTx (..))
import qualified Cardano.Api.Consensus as Byron
import qualified Cardano.Api.Ledger as L
import qualified Cardano.Api.Network as Net.Tx

import qualified Cardano.Binary as Binary
import Cardano.CLI.Byron.Key (byronWitnessToVerKey)
import Cardano.CLI.Types.Common (TxFile)
import qualified Cardano.Crypto.Signing as Crypto

import Data.Bifunctor (Bifunctor (..))
import Data.ByteString (ByteString)
import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as LB
import qualified Data.List as List
import Data.Map.Strict (Map)
import qualified Data.Map.Strict as Map
import Data.Maybe (fromMaybe, mapMaybe)
import Data.String (IsString)
import Data.Text (Text)
import qualified Data.Text as Text
import qualified Data.Text.IO as Text
import Formatting (sformat, (%))
import GHC.Exts (IsList (..))
import Cardano.Api
import Cardano.Api.Byron qualified as Byron
import Cardano.Api.Consensus (ByronBlock, EraMismatch (..), GenTx (..))
import Cardano.Api.Consensus qualified as Byron
import Cardano.Api.Ledger qualified as L
import Cardano.Api.Network qualified as Net.Tx

import Cardano.Binary qualified as Binary
import Cardano.CLI.Byron.Key (byronWitnessToVerKey)
import Cardano.CLI.Types.Common (TxFile)
import Cardano.Crypto.Signing qualified as Crypto

import Data.Bifunctor (Bifunctor (..))
import Data.ByteString (ByteString)
import Data.ByteString qualified as B
import Data.ByteString.Lazy qualified as LB
import Data.List qualified as List
import Data.Map.Strict (Map)
import Data.Map.Strict qualified as Map
import Data.Maybe (fromMaybe, mapMaybe)
import Data.String (IsString)
import Data.Text (Text)
import Data.Text qualified as Text
import Data.Text.IO qualified as Text
import Formatting (sformat, (%))
import GHC.Exts (IsList (..))

data ByronTxError
= TxDeserialisationFailed !FilePath !Binary.DecoderError
Expand Down
Loading

0 comments on commit 8cae5c1

Please sign in to comment.