Refactor modules structure to make it more domain-related instead of function-related

.git-blame-ignore-revs

@@ -2,3 +2,4 @@
 ddeefdf97d635634083ea286af05c1026d4bc28b
 cdd0ead52f740eca8cedb152307992a11c6b478a
 197f6f2caeaa9ca409ca13a61faae917731ada7f
+5bec557d4bce5263afe7c9cff1158c5502b9153d

cardano-cli/app/cardano-cli.hs

@@ -7,7 +7,7 @@
 
 import           Cardano.Api
 import           Cardano.CLI.Environment (getEnvCli)
-import           Cardano.CLI.Options (opts, pref)
+import           Cardano.CLI.Option (opts, pref)
 import           Cardano.CLI.Run (renderClientCommandError, runClientCommand)
 import           Cardano.CLI.TopHandler
 import qualified Cardano.Crypto.Init as Crypto

cardano-cli/cardano-cli.cabal

@@ -50,165 +50,170 @@ library
     ghc-options: -Wno-redundant-constraints
   hs-source-dirs: src
   exposed-modules:
-    Cardano.CLI.Byron.Commands
+    Cardano.CLI.Byron.Command
     Cardano.CLI.Byron.Delegation
     Cardano.CLI.Byron.Genesis
     Cardano.CLI.Byron.Key
     Cardano.CLI.Byron.Legacy
-    Cardano.CLI.Byron.Parsers
+    Cardano.CLI.Byron.Parser
     Cardano.CLI.Byron.Run
     Cardano.CLI.Byron.Tx
     Cardano.CLI.Byron.UpdateProposal
     Cardano.CLI.Byron.Vote
-    Cardano.CLI.Commands
-    Cardano.CLI.Commands.Address
-    Cardano.CLI.Commands.Debug
-    Cardano.CLI.Commands.Debug.CheckNodeConfiguration
-    Cardano.CLI.Commands.Debug.LogEpochState
-    Cardano.CLI.Commands.Debug.TransactionView
-    Cardano.CLI.Commands.Hash
-    Cardano.CLI.Commands.Key
-    Cardano.CLI.Commands.Node
-    Cardano.CLI.Commands.Ping
-    Cardano.CLI.Compatible.Commands
+    Cardano.CLI.Command
+    Cardano.CLI.Compatible.Command
     Cardano.CLI.Compatible.Exception
-    Cardano.CLI.Compatible.Governance
+    Cardano.CLI.Compatible.Governance.Command
+    Cardano.CLI.Compatible.Governance.Option
+    Cardano.CLI.Compatible.Governance.Run
+    Cardano.CLI.Compatible.Option
     Cardano.CLI.Compatible.Run
-    Cardano.CLI.Compatible.Transaction
+    Cardano.CLI.Compatible.Transaction.Command
+    Cardano.CLI.Compatible.Transaction.Option
+    Cardano.CLI.Compatible.Transaction.Run
     Cardano.CLI.Environment
-    Cardano.CLI.EraBased.Commands.Genesis
-    Cardano.CLI.EraBased.Commands.Governance
-    Cardano.CLI.EraBased.Commands.Governance.Actions
-    Cardano.CLI.EraBased.Commands.Governance.Committee
-    Cardano.CLI.EraBased.Commands.Governance.DRep
-    Cardano.CLI.EraBased.Commands.Governance.Poll
-    Cardano.CLI.EraBased.Commands.Governance.Vote
-    Cardano.CLI.EraBased.Commands.Query
-    Cardano.CLI.EraBased.Commands.StakeAddress
-    Cardano.CLI.EraBased.Commands.StakePool
-    Cardano.CLI.EraBased.Commands.TextView
-    Cardano.CLI.EraBased.Commands.TopLevelCommands
-    Cardano.CLI.EraBased.Commands.Transaction
-    Cardano.CLI.EraBased.Options.Common
-    Cardano.CLI.EraBased.Options.Era
-    Cardano.CLI.EraBased.Options.Genesis
-    Cardano.CLI.EraBased.Options.Governance
-    Cardano.CLI.EraBased.Options.Governance.Actions
-    Cardano.CLI.EraBased.Options.Governance.Committee
-    Cardano.CLI.EraBased.Options.Governance.DRep
-    Cardano.CLI.EraBased.Options.Governance.Poll
-    Cardano.CLI.EraBased.Options.Governance.Vote
-    Cardano.CLI.EraBased.Options.Query
-    Cardano.CLI.EraBased.Options.StakeAddress
-    Cardano.CLI.EraBased.Options.StakePool
-    Cardano.CLI.EraBased.Options.TextView
-    Cardano.CLI.EraBased.Options.TopLevelCommands
-    Cardano.CLI.EraBased.Options.Transaction
+    Cardano.CLI.EraBased.Command
+    Cardano.CLI.EraBased.Common.Option
+    Cardano.CLI.EraBased.Genesis.Command
+    Cardano.CLI.EraBased.Genesis.CreateTestnetData.Run
+    Cardano.CLI.EraBased.Genesis.Internal.Byron
+    Cardano.CLI.EraBased.Genesis.Internal.Common
+    Cardano.CLI.EraBased.Genesis.Option
+    Cardano.CLI.EraBased.Genesis.Run
+    Cardano.CLI.EraBased.Governance.Actions.Command
+    Cardano.CLI.EraBased.Governance.Actions.Option
+    Cardano.CLI.EraBased.Governance.Actions.Run
+    Cardano.CLI.EraBased.Governance.Command
+    Cardano.CLI.EraBased.Governance.Committee.Command
+    Cardano.CLI.EraBased.Governance.Committee.Option
+    Cardano.CLI.EraBased.Governance.Committee.Run
+    Cardano.CLI.EraBased.Governance.DRep.Command
+    Cardano.CLI.EraBased.Governance.DRep.Option
+    Cardano.CLI.EraBased.Governance.DRep.Run
+    Cardano.CLI.EraBased.Governance.GenesisKeyDelegationCertificate.Run
+    Cardano.CLI.EraBased.Governance.Option
+    Cardano.CLI.EraBased.Governance.Poll.Command
+    Cardano.CLI.EraBased.Governance.Poll.Option
+    Cardano.CLI.EraBased.Governance.Poll.Run
+    Cardano.CLI.EraBased.Governance.Run
+    Cardano.CLI.EraBased.Governance.Vote.Command
+    Cardano.CLI.EraBased.Governance.Vote.Option
+    Cardano.CLI.EraBased.Governance.Vote.Run
+    Cardano.CLI.EraBased.Option
+    Cardano.CLI.EraBased.Query.Command
+    Cardano.CLI.EraBased.Query.Option
+    Cardano.CLI.EraBased.Query.Run
     Cardano.CLI.EraBased.Run
-    Cardano.CLI.EraBased.Run.Genesis
-    Cardano.CLI.EraBased.Run.Genesis.Byron
-    Cardano.CLI.EraBased.Run.Genesis.Common
-    Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData
-    Cardano.CLI.EraBased.Run.Governance
-    Cardano.CLI.EraBased.Run.Governance.Actions
-    Cardano.CLI.EraBased.Run.Governance.Committee
-    Cardano.CLI.EraBased.Run.Governance.DRep
-    Cardano.CLI.EraBased.Run.Governance.GenesisKeyDelegationCertificate
-    Cardano.CLI.EraBased.Run.Governance.Poll
-    Cardano.CLI.EraBased.Run.Governance.Vote
-    Cardano.CLI.EraBased.Run.Query
-    Cardano.CLI.EraBased.Run.StakeAddress
-    Cardano.CLI.EraBased.Run.StakePool
-    Cardano.CLI.EraBased.Run.TextView
-    Cardano.CLI.EraBased.Run.Transaction
     Cardano.CLI.EraBased.Script.Certificate.Read
-    Cardano.CLI.EraBased.Script.Certificate.Types
+    Cardano.CLI.EraBased.Script.Certificate.Type
     Cardano.CLI.EraBased.Script.Mint.Read
-    Cardano.CLI.EraBased.Script.Mint.Types
+    Cardano.CLI.EraBased.Script.Mint.Type
     Cardano.CLI.EraBased.Script.Proposal.Read
-    Cardano.CLI.EraBased.Script.Proposal.Types
+    Cardano.CLI.EraBased.Script.Proposal.Type
     Cardano.CLI.EraBased.Script.Read.Common
     Cardano.CLI.EraBased.Script.Spend.Read
-    Cardano.CLI.EraBased.Script.Spend.Types
-    Cardano.CLI.EraBased.Script.Types
+    Cardano.CLI.EraBased.Script.Spend.Type
+    Cardano.CLI.EraBased.Script.Type
     Cardano.CLI.EraBased.Script.Vote.Read
-    Cardano.CLI.EraBased.Script.Vote.Types
+    Cardano.CLI.EraBased.Script.Vote.Type
     Cardano.CLI.EraBased.Script.Withdrawal.Read
-    Cardano.CLI.EraBased.Script.Withdrawal.Types
-    Cardano.CLI.EraBased.Transaction.HashCheck
-    Cardano.CLI.Helpers
+    Cardano.CLI.EraBased.Script.Withdrawal.Type
+    Cardano.CLI.EraBased.StakeAddress.Command
+    Cardano.CLI.EraBased.StakeAddress.Option
+    Cardano.CLI.EraBased.StakeAddress.Run
+    Cardano.CLI.EraBased.StakePool.Command
+    Cardano.CLI.EraBased.StakePool.Option
+    Cardano.CLI.EraBased.StakePool.Run
+    Cardano.CLI.EraBased.TextView.Command
+    Cardano.CLI.EraBased.TextView.Option
+    Cardano.CLI.EraBased.TextView.Run
+    Cardano.CLI.EraBased.Transaction.Command
+    Cardano.CLI.EraBased.Transaction.Internal.HashCheck
+    Cardano.CLI.EraBased.Transaction.Option
+    Cardano.CLI.EraBased.Transaction.Run
+    Cardano.CLI.EraIndependent.Address.Command
+    Cardano.CLI.EraIndependent.Address.Info.Run
+    Cardano.CLI.EraIndependent.Address.Option
+    Cardano.CLI.EraIndependent.Address.Run
+    Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Command
+    Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Run
+    Cardano.CLI.EraIndependent.Debug.Command
+    Cardano.CLI.EraIndependent.Debug.LogEpochState.Command
+    Cardano.CLI.EraIndependent.Debug.LogEpochState.Run
+    Cardano.CLI.EraIndependent.Debug.Option
+    Cardano.CLI.EraIndependent.Debug.Run
+    Cardano.CLI.EraIndependent.Debug.TransactionView.Command
+    Cardano.CLI.EraIndependent.Debug.TransactionView.Run
+    Cardano.CLI.EraIndependent.Hash.Command
+    Cardano.CLI.EraIndependent.Hash.Internal.Common
+    Cardano.CLI.EraIndependent.Hash.Option
+    Cardano.CLI.EraIndependent.Hash.Run
+    Cardano.CLI.EraIndependent.Key.Command
+    Cardano.CLI.EraIndependent.Key.Option
+    Cardano.CLI.EraIndependent.Key.Run
+    Cardano.CLI.EraIndependent.Node.Command
+    Cardano.CLI.EraIndependent.Node.Option
+    Cardano.CLI.EraIndependent.Node.Run
+    Cardano.CLI.EraIndependent.Ping.Command
+    Cardano.CLI.EraIndependent.Ping.Option
+    Cardano.CLI.EraIndependent.Ping.Run
+    Cardano.CLI.Helper
     Cardano.CLI.IO.Lazy
     Cardano.CLI.Json.Friendly
-    Cardano.CLI.Legacy.Commands
-    Cardano.CLI.Legacy.Commands.Genesis
-    Cardano.CLI.Legacy.Commands.Governance
-    Cardano.CLI.Legacy.Options
+    Cardano.CLI.Legacy.Command
+    Cardano.CLI.Legacy.Genesis.Command
+    Cardano.CLI.Legacy.Genesis.Run
+    Cardano.CLI.Legacy.Governance.Command
+    Cardano.CLI.Legacy.Governance.Run
+    Cardano.CLI.Legacy.Option
     Cardano.CLI.Legacy.Run
-    Cardano.CLI.Legacy.Run.Genesis
-    Cardano.CLI.Legacy.Run.Governance
     Cardano.CLI.OS.Posix
-    Cardano.CLI.Options
-    Cardano.CLI.Options.Address
-    Cardano.CLI.Options.Debug
-    Cardano.CLI.Options.Hash
-    Cardano.CLI.Options.Key
-    Cardano.CLI.Options.Node
-    Cardano.CLI.Options.Ping
-    Cardano.CLI.Orphans
+    Cardano.CLI.Option
+    Cardano.CLI.Orphan
     Cardano.CLI.Parser
     Cardano.CLI.Read
     Cardano.CLI.Render
     Cardano.CLI.Run
-    Cardano.CLI.Run.Address
-    Cardano.CLI.Run.Address.Info
-    Cardano.CLI.Run.Debug
-    Cardano.CLI.Run.Debug.CheckNodeConfiguration
-    Cardano.CLI.Run.Debug.LogEpochState
-    Cardano.CLI.Run.Debug.TransactionView
-    Cardano.CLI.Run.Hash
-    Cardano.CLI.Run.Key
-    Cardano.CLI.Run.Node
-    Cardano.CLI.Run.Ping
     Cardano.CLI.TopHandler
-    Cardano.CLI.Types.Common
-    Cardano.CLI.Types.Errors.AddressCmdError
-    Cardano.CLI.Types.Errors.AddressInfoError
-    Cardano.CLI.Types.Errors.BootstrapWitnessError
-    Cardano.CLI.Types.Errors.CardanoAddressSigningKeyConversionError
-    Cardano.CLI.Types.Errors.CmdError
-    Cardano.CLI.Types.Errors.DebugCmdError
-    Cardano.CLI.Types.Errors.DelegationError
-    Cardano.CLI.Types.Errors.GenesisCmdError
-    Cardano.CLI.Types.Errors.GovernanceActionsError
-    Cardano.CLI.Types.Errors.GovernanceCmdError
-    Cardano.CLI.Types.Errors.GovernanceCommitteeError
-    Cardano.CLI.Types.Errors.GovernanceQueryError
-    Cardano.CLI.Types.Errors.GovernanceVoteCmdError
-    Cardano.CLI.Types.Errors.HashCmdError
-    Cardano.CLI.Types.Errors.ItnKeyConversionError
-    Cardano.CLI.Types.Errors.KeyCmdError
-    Cardano.CLI.Types.Errors.NodeCmdError
-    Cardano.CLI.Types.Errors.NodeEraMismatchError
-    Cardano.CLI.Types.Errors.PlutusScriptDecodeError
-    Cardano.CLI.Types.Errors.ProtocolParamsError
-    Cardano.CLI.Types.Errors.QueryCmdError
-    Cardano.CLI.Types.Errors.RegistrationError
-    Cardano.CLI.Types.Errors.ScriptDataError
-    Cardano.CLI.Types.Errors.ScriptDecodeError
-    Cardano.CLI.Types.Errors.StakeAddressCmdError
-    Cardano.CLI.Types.Errors.StakeAddressDelegationError
-    Cardano.CLI.Types.Errors.StakeAddressRegistrationError
-    Cardano.CLI.Types.Errors.StakeCredentialError
-    Cardano.CLI.Types.Errors.StakePoolCmdError
-    Cardano.CLI.Types.Errors.TextViewFileError
-    Cardano.CLI.Types.Errors.TxCmdError
-    Cardano.CLI.Types.Errors.TxValidationError
-    Cardano.CLI.Types.Governance
-    Cardano.CLI.Types.Key
-    Cardano.CLI.Types.Key.VerificationKey
-    Cardano.CLI.Types.MonadWarning
-    Cardano.CLI.Types.Output
-    Cardano.CLI.Types.TxFeature
+    Cardano.CLI.Type.Common
+    Cardano.CLI.Type.Error.AddressCmdError
+    Cardano.CLI.Type.Error.AddressInfoError
+    Cardano.CLI.Type.Error.BootstrapWitnessError
+    Cardano.CLI.Type.Error.CardanoAddressSigningKeyConversionError
+    Cardano.CLI.Type.Error.CmdError
+    Cardano.CLI.Type.Error.DebugCmdError
+    Cardano.CLI.Type.Error.DelegationError
+    Cardano.CLI.Type.Error.GenesisCmdError
+    Cardano.CLI.Type.Error.GovernanceActionsError
+    Cardano.CLI.Type.Error.GovernanceCmdError
+    Cardano.CLI.Type.Error.GovernanceCommitteeError
+    Cardano.CLI.Type.Error.GovernanceQueryError
+    Cardano.CLI.Type.Error.GovernanceVoteCmdError
+    Cardano.CLI.Type.Error.HashCmdError
+    Cardano.CLI.Type.Error.ItnKeyConversionError
+    Cardano.CLI.Type.Error.KeyCmdError
+    Cardano.CLI.Type.Error.NodeCmdError
+    Cardano.CLI.Type.Error.NodeEraMismatchError
+    Cardano.CLI.Type.Error.PlutusScriptDecodeError
+    Cardano.CLI.Type.Error.ProtocolParamsError
+    Cardano.CLI.Type.Error.QueryCmdError
+    Cardano.CLI.Type.Error.RegistrationError
+    Cardano.CLI.Type.Error.ScriptDataError
+    Cardano.CLI.Type.Error.ScriptDecodeError
+    Cardano.CLI.Type.Error.StakeAddressCmdError
+    Cardano.CLI.Type.Error.StakeAddressDelegationError
+    Cardano.CLI.Type.Error.StakeAddressRegistrationError
+    Cardano.CLI.Type.Error.StakeCredentialError
+    Cardano.CLI.Type.Error.StakePoolCmdError
+    Cardano.CLI.Type.Error.TextViewFileError
+    Cardano.CLI.Type.Error.TxCmdError
+    Cardano.CLI.Type.Error.TxValidationError
+    Cardano.CLI.Type.Governance
+    Cardano.CLI.Type.Key
+    Cardano.CLI.Type.Key.VerificationKey
+    Cardano.CLI.Type.MonadWarning
+    Cardano.CLI.Type.Output
+    Cardano.CLI.Type.TxFeature
 
   other-modules: Paths_cardano_cli
   autogen-modules: Paths_cardano_cli

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

@@ -1,7 +1,7 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GeneralisedNewtypeDeriving #-}
 
-module Cardano.CLI.Byron.Commands
+module Cardano.CLI.Byron.Command
   ( ByronCommand (..)
   , NodeCmds (..)
   , VerificationKeyFile
@@ -17,7 +17,7 @@ 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.Type.Common
 
 import Data.String (IsString)
 

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

@@ -18,7 +18,7 @@ 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.CLI.Type.Common (CertificateFile (..))
 import Cardano.Crypto (ProtocolMagicId)
 import Cardano.Crypto qualified as Crypto
 import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)

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

@@ -23,7 +23,7 @@ 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.CLI.Type.Common (GenesisFile (..))
 import Cardano.Crypto qualified as Crypto
 import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
 

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

@@ -18,7 +18,7 @@ where
 
 import Cardano.Api.Byron
 
-import Cardano.CLI.Types.Common
+import Cardano.CLI.Type.Common
 import Cardano.Crypto.Signing qualified as Crypto
 
 import Control.Exception (Exception (..))

cardano-cli/src/Cardano/CLI/Byron/Parsers.hs → cardano-cli/src/Cardano/CLI/Byron/Parser.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 
-module Cardano.CLI.Byron.Parsers
+module Cardano.CLI.Byron.Parser
   ( ByronCommand (..)
   , NodeCmds (..)
   , backwardsCompatibilityCommands
@@ -30,14 +30,14 @@ 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.Command
 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.EraBased.Common.Option hiding (parseLovelace, parseTxIn)
 import Cardano.CLI.Run (ClientCommand (ByronCommand))
-import Cardano.CLI.Types.Common
+import Cardano.CLI.Type.Common
 import Cardano.Crypto (RequiresNetworkMagic (..))
 import Cardano.Crypto.Hashing (hashRaw)
 import Cardano.Crypto.ProtocolMagic