From de52238aa2a2f33eb87ee019920d25a7454e68ee Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Mon, 24 Feb 2025 11:46:28 +0100 Subject: [PATCH] Modules rename --- cardano-cli/app/cardano-cli.hs | 2 +- cardano-cli/cardano-cli.cabal | 266 +++++++++--------- .../CLI/Byron/{Commands.hs => Command.hs} | 4 +- .../src/Cardano/CLI/Byron/Delegation.hs | 2 +- cardano-cli/src/Cardano/CLI/Byron/Genesis.hs | 2 +- cardano-cli/src/Cardano/CLI/Byron/Key.hs | 2 +- .../CLI/Byron/{Parsers.hs => Parser.hs} | 8 +- cardano-cli/src/Cardano/CLI/Byron/Run.hs | 6 +- cardano-cli/src/Cardano/CLI/Byron/Tx.hs | 2 +- .../src/Cardano/CLI/Byron/UpdateProposal.hs | 4 +- cardano-cli/src/Cardano/CLI/Byron/Vote.hs | 4 +- .../Cardano/CLI/{Commands.hs => Command.hs} | 24 +- cardano-cli/src/Cardano/CLI/Commands/Debug.hs | 13 - .../src/Cardano/CLI/Compatible/Command.hs | 36 +++ .../src/Cardano/CLI/Compatible/Governance.hs | 39 --- .../CLI/Compatible/Governance/Command.hs | 22 ++ .../CLI/Compatible/Governance/Option.hs | 19 ++ .../Cardano/CLI/Compatible/Governance/Run.hs | 17 ++ .../CLI/Compatible/{Commands.hs => Option.hs} | 32 +-- cardano-cli/src/Cardano/CLI/Compatible/Run.hs | 8 +- .../CLI/Compatible/Transaction/Command.hs | 66 +++++ .../CLI/Compatible/Transaction/Option.hs | 152 ++++++++++ .../{Transaction.hs => Transaction/Run.hs} | 186 +----------- .../TopLevelCommands.hs => Command.hs} | 22 +- .../{Options/Common.hs => Common/Option.hs} | 32 +-- .../Genesis.hs => Genesis/Command.hs} | 4 +- .../CreateTestnetData/Run.hs} | 36 +-- .../Genesis => Genesis/Internal}/Byron.hs | 2 +- .../Genesis => Genesis/Internal}/Common.hs | 8 +- .../{Options/Genesis.hs => Genesis/Option.hs} | 8 +- .../{Run/Genesis.hs => Genesis/Run.hs} | 26 +- .../Actions/Command.hs} | 6 +- .../Actions/Option.hs} | 8 +- .../Actions.hs => Governance/Actions/Run.hs} | 16 +- .../Governance.hs => Governance/Command.hs} | 14 +- .../Committee/Command.hs} | 8 +- .../Committee/Option.hs} | 8 +- .../Committee/Run.hs} | 16 +- .../DRep.hs => Governance/DRep/Command.hs} | 8 +- .../DRep.hs => Governance/DRep/Option.hs} | 10 +- .../DRep.hs => Governance/DRep/Run.hs} | 22 +- .../GenesisKeyDelegationCertificate/Run.hs} | 6 +- .../Governance.hs => Governance/Option.hs} | 16 +- .../Poll.hs => Governance/Poll/Command.hs} | 2 +- .../Poll.hs => Governance/Poll/Option.hs} | 6 +- .../Poll.hs => Governance/Poll/Run.hs} | 6 +- .../{Run/Governance.hs => Governance/Run.hs} | 20 +- .../Vote.hs => Governance/Vote/Command.hs} | 6 +- .../Vote.hs => Governance/Vote/Option.hs} | 8 +- .../Vote.hs => Governance/Vote/Run.hs} | 16 +- .../EraBased/{Options/Era.hs => Option.hs} | 37 ++- .../CLI/EraBased/Options/TopLevelCommands.hs | 39 --- .../{Commands/Query.hs => Query/Command.hs} | 8 +- .../{Options/Query.hs => Query/Option.hs} | 10 +- .../EraBased/{Run/Query.hs => Query/Run.hs} | 20 +- cardano-cli/src/Cardano/CLI/EraBased/Run.hs | 26 +- .../CLI/EraBased/Script/Certificate/Read.hs | 6 +- .../Script/Certificate/{Types.hs => Type.hs} | 4 +- .../Cardano/CLI/EraBased/Script/Mint/Read.hs | 4 +- .../Script/Mint/{Types.hs => Type.hs} | 4 +- .../CLI/EraBased/Script/Proposal/Read.hs | 6 +- .../Script/Proposal/{Types.hs => Type.hs} | 4 +- .../CLI/EraBased/Script/Read/Common.hs | 10 +- .../Cardano/CLI/EraBased/Script/Spend/Read.hs | 4 +- .../Script/Spend/{Types.hs => Type.hs} | 4 +- .../CLI/EraBased/Script/{Types.hs => Type.hs} | 8 +- .../Cardano/CLI/EraBased/Script/Vote/Read.hs | 6 +- .../Script/Vote/{Types.hs => Type.hs} | 4 +- .../CLI/EraBased/Script/Withdrawal/Read.hs | 4 +- .../Script/Withdrawal/{Types.hs => Type.hs} | 4 +- .../Command.hs} | 8 +- .../Option.hs} | 6 +- .../StakeAddress.hs => StakeAddress/Run.hs} | 16 +- .../StakePool.hs => StakePool/Command.hs} | 8 +- .../StakePool.hs => StakePool/Option.hs} | 8 +- .../{Run/StakePool.hs => StakePool/Run.hs} | 18 +- .../TextView.hs => TextView/Command.hs} | 2 +- .../TextView.hs => TextView/Option.hs} | 6 +- .../{Run/TextView.hs => TextView/Run.hs} | 8 +- .../Transaction.hs => Transaction/Command.hs} | 20 +- .../Transaction/{ => Internal}/HashCheck.hs | 8 +- .../Transaction.hs => Transaction/Option.hs} | 8 +- .../Transaction.hs => Transaction/Run.hs} | 40 +-- .../Address/Command.hs} | 6 +- .../Address/Info/Run.hs} | 4 +- .../Address/Option.hs} | 6 +- .../Address/Run.hs} | 14 +- .../Debug/CheckNodeConfiguration/Command.hs} | 2 +- .../Debug/CheckNodeConfiguration/Run.hs} | 6 +- .../CLI/EraIndependent/Debug/Command.hs | 13 + .../Debug/LogEpochState/Command.hs} | 4 +- .../Debug/LogEpochState/Run.hs} | 6 +- .../Debug/Option.hs} | 12 +- .../Debug.hs => EraIndependent/Debug/Run.hs} | 12 +- .../Debug/TransactionView/Command.hs} | 4 +- .../Debug/TransactionView/Run.hs} | 8 +- .../Hash/Command.hs} | 4 +- .../Hash.hs => EraIndependent/Hash/Option.hs} | 6 +- .../Hash.hs => EraIndependent/Hash/Run.hs} | 8 +- .../Key.hs => EraIndependent/Key/Command.hs} | 4 +- .../Key.hs => EraIndependent/Key/Option.hs} | 8 +- .../{Run/Key.hs => EraIndependent/Key/Run.hs} | 14 +- .../Node/Command.hs} | 6 +- .../Node.hs => EraIndependent/Node/Option.hs} | 8 +- .../Node.hs => EraIndependent/Node/Run.hs} | 10 +- .../Ping/Command.hs} | 2 +- .../Ping.hs => EraIndependent/Ping/Option.hs} | 8 +- .../Ping.hs => EraIndependent/Ping/Run.hs} | 4 +- .../src/Cardano/CLI/{Helpers.hs => Helper.hs} | 4 +- cardano-cli/src/Cardano/CLI/Json/Friendly.hs | 6 +- .../CLI/Legacy/{Commands.hs => Command.hs} | 6 +- .../Genesis.hs => Genesis/Command.hs} | 4 +- .../Legacy/{Run/Genesis.hs => Genesis/Run.hs} | 16 +- .../Governance.hs => Governance/Command.hs} | 6 +- .../{Run/Governance.hs => Governance/Run.hs} | 16 +- .../CLI/Legacy/{Options.hs => Option.hs} | 14 +- cardano-cli/src/Cardano/CLI/Legacy/Run.hs | 8 +- .../src/Cardano/CLI/{Options.hs => Option.hs} | 26 +- .../src/Cardano/CLI/{Orphans.hs => Orphan.hs} | 2 +- cardano-cli/src/Cardano/CLI/Parser.hs | 2 +- cardano-cli/src/Cardano/CLI/Read.hs | 24 +- cardano-cli/src/Cardano/CLI/Run.hs | 38 +-- .../src/Cardano/CLI/{Types => Type}/Common.hs | 2 +- .../Errors => Type/Error}/AddressCmdError.hs | 6 +- .../Errors => Type/Error}/AddressInfoError.hs | 2 +- .../Error}/BootstrapWitnessError.hs | 2 +- ...CardanoAddressSigningKeyConversionError.hs | 2 +- .../{Types/Errors => Type/Error}/CmdError.hs | 34 +-- .../Errors => Type/Error}/DebugCmdError.hs | 4 +- .../Errors => Type/Error}/DelegationError.hs | 4 +- .../Errors => Type/Error}/GenesisCmdError.hs | 14 +- .../Error}/GovernanceActionsError.hs | 6 +- .../Error}/GovernanceCmdError.hs | 6 +- .../Error}/GovernanceCommitteeError.hs | 6 +- .../Error}/GovernanceQueryError.hs | 2 +- .../Error}/GovernanceVoteCmdError.hs | 6 +- .../Errors => Type/Error}/HashCmdError.hs | 2 +- .../Error}/ItnKeyConversionError.hs | 2 +- .../Errors => Type/Error}/KeyCmdError.hs | 8 +- .../Errors => Type/Error}/NodeCmdError.hs | 2 +- .../Error}/NodeEraMismatchError.hs | 2 +- .../Error}/PlutusScriptDecodeError.hs | 2 +- .../Error}/ProtocolParamsError.hs | 2 +- .../Errors => Type/Error}/QueryCmdError.hs | 8 +- .../Error}/RegistrationError.hs | 8 +- .../Errors => Type/Error}/ScriptDataError.hs | 2 +- .../Error}/ScriptDecodeError.hs | 2 +- .../Error}/StakeAddressCmdError.hs | 10 +- .../Error}/StakeAddressDelegationError.hs | 2 +- .../Error}/StakeAddressRegistrationError.hs | 2 +- .../Error}/StakeCredentialError.hs | 4 +- .../Error}/StakePoolCmdError.hs | 4 +- .../Error}/TextViewFileError.hs | 4 +- .../Errors => Type/Error}/TxCmdError.hs | 22 +- .../Error}/TxValidationError.hs | 4 +- .../Cardano/CLI/{Types => Type}/Governance.hs | 4 +- .../src/Cardano/CLI/{Types => Type}/Key.hs | 4 +- .../{Types => Type}/Key/VerificationKey.hs | 2 +- .../CLI/{Types => Type}/MonadWarning.hs | 4 +- .../src/Cardano/CLI/{Types => Type}/Output.hs | 4 +- .../Cardano/CLI/{Types => Type}/TxFeature.hs | 2 +- .../Test/Golden/Byron/SigningKeys.hs | 2 +- .../Golden/EraBased/Governance/VerifyPoll.hs | 2 +- .../Test/Golden/ErrorsSpec.hs | 32 +-- .../Test/Cli/AddCostModels.hs | 2 +- .../test/cardano-cli-test/Test/Cli/ITN.hs | 2 +- .../test/cardano-cli-test/Test/Cli/Json.hs | 4 +- .../cardano-cli-test/Test/Cli/MonadWarning.hs | 2 +- .../test/cardano-cli-test/Test/Cli/Parser.hs | 2 +- .../Test/Cli/Shelley/Run/Query.hs | 2 +- 170 files changed, 1160 insertions(+), 1073 deletions(-) rename cardano-cli/src/Cardano/CLI/Byron/{Commands.hs => Command.hs} (97%) rename cardano-cli/src/Cardano/CLI/Byron/{Parsers.hs => Parser.hs} (99%) rename cardano-cli/src/Cardano/CLI/{Commands.hs => Command.hs} (61%) delete mode 100644 cardano-cli/src/Cardano/CLI/Commands/Debug.hs create mode 100644 cardano-cli/src/Cardano/CLI/Compatible/Command.hs delete mode 100644 cardano-cli/src/Cardano/CLI/Compatible/Governance.hs create mode 100644 cardano-cli/src/Cardano/CLI/Compatible/Governance/Command.hs create mode 100644 cardano-cli/src/Cardano/CLI/Compatible/Governance/Option.hs create mode 100644 cardano-cli/src/Cardano/CLI/Compatible/Governance/Run.hs rename cardano-cli/src/Cardano/CLI/Compatible/{Commands.hs => Option.hs} (69%) create mode 100644 cardano-cli/src/Cardano/CLI/Compatible/Transaction/Command.hs create mode 100644 cardano-cli/src/Cardano/CLI/Compatible/Transaction/Option.hs rename cardano-cli/src/Cardano/CLI/Compatible/{Transaction.hs => Transaction/Run.hs} (51%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/TopLevelCommands.hs => Command.hs} (71%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Common.hs => Common/Option.hs} (99%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/Genesis.hs => Genesis/Command.hs} (98%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Genesis/CreateTestnetData.hs => Genesis/CreateTestnetData/Run.hs} (97%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Genesis => Genesis/Internal}/Byron.hs (98%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Genesis => Genesis/Internal}/Common.hs (96%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Genesis.hs => Genesis/Option.hs} (99%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Genesis.hs => Genesis/Run.hs} (98%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/Governance/Actions.hs => Governance/Actions/Command.hs} (98%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Governance/Actions.hs => Governance/Actions/Option.hs} (98%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Governance/Actions.hs => Governance/Actions/Run.hs} (97%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/Governance.hs => Governance/Command.hs} (84%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/Governance/Committee.hs => Governance/Committee/Command.hs} (93%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Governance/Committee.hs => Governance/Committee/Option.hs} (96%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Governance/Committee.hs => Governance/Committee/Run.hs} (94%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/Governance/DRep.hs => Governance/DRep/Command.hs} (95%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Governance/DRep.hs => Governance/DRep/Option.hs} (95%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Governance/DRep.hs => Governance/DRep/Run.hs} (92%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Governance/GenesisKeyDelegationCertificate.hs => Governance/GenesisKeyDelegationCertificate/Run.hs} (90%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Governance.hs => Governance/Option.hs} (90%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/Governance/Poll.hs => Governance/Poll/Command.hs} (96%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Governance/Poll.hs => Governance/Poll/Option.hs} (93%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Governance/Poll.hs => Governance/Poll/Run.hs} (97%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Governance.hs => Governance/Run.hs} (89%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/Governance/Vote.hs => Governance/Vote/Command.hs} (92%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Governance/Vote.hs => Governance/Vote/Option.hs} (93%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Governance/Vote.hs => Governance/Vote/Run.hs} (92%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Era.hs => Option.hs} (57%) delete mode 100644 cardano-cli/src/Cardano/CLI/EraBased/Options/TopLevelCommands.hs rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/Query.hs => Query/Command.hs} (98%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Query.hs => Query/Option.hs} (99%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Query.hs => Query/Run.hs} (99%) rename cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/{Types.hs => Type.hs} (94%) rename cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/{Types.hs => Type.hs} (96%) rename cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/{Types.hs => Type.hs} (94%) rename cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/{Types.hs => Type.hs} (96%) rename cardano-cli/src/Cardano/CLI/EraBased/Script/{Types.hs => Type.hs} (85%) rename cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/{Types.hs => Type.hs} (94%) rename cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/{Types.hs => Type.hs} (94%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/StakeAddress.hs => StakeAddress/Command.hs} (95%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/StakeAddress.hs => StakeAddress/Option.hs} (98%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/StakeAddress.hs => StakeAddress/Run.hs} (97%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/StakePool.hs => StakePool/Command.hs} (94%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/StakePool.hs => StakePool/Option.hs} (95%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/StakePool.hs => StakePool/Run.hs} (95%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/TextView.hs => TextView/Command.hs} (89%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/TextView.hs => TextView/Option.hs} (86%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/TextView.hs => TextView/Run.hs} (81%) rename cardano-cli/src/Cardano/CLI/EraBased/{Commands/Transaction.hs => Transaction/Command.hs} (95%) rename cardano-cli/src/Cardano/CLI/EraBased/Transaction/{ => Internal}/HashCheck.hs (90%) rename cardano-cli/src/Cardano/CLI/EraBased/{Options/Transaction.hs => Transaction/Option.hs} (98%) rename cardano-cli/src/Cardano/CLI/EraBased/{Run/Transaction.hs => Transaction/Run.hs} (98%) rename cardano-cli/src/Cardano/CLI/{Commands/Address.hs => EraIndependent/Address/Command.hs} (88%) rename cardano-cli/src/Cardano/CLI/{Run/Address/Info.hs => EraIndependent/Address/Info/Run.hs} (95%) rename cardano-cli/src/Cardano/CLI/{Options/Address.hs => EraIndependent/Address/Option.hs} (93%) rename cardano-cli/src/Cardano/CLI/{Run/Address.hs => EraIndependent/Address/Run.hs} (96%) rename cardano-cli/src/Cardano/CLI/{Commands/Debug/CheckNodeConfiguration.hs => EraIndependent/Debug/CheckNodeConfiguration/Command.hs} (72%) rename cardano-cli/src/Cardano/CLI/{Run/Debug/CheckNodeConfiguration.hs => EraIndependent/Debug/CheckNodeConfiguration/Run.hs} (94%) create mode 100644 cardano-cli/src/Cardano/CLI/EraIndependent/Debug/Command.hs rename cardano-cli/src/Cardano/CLI/{Commands/Debug/LogEpochState.hs => EraIndependent/Debug/LogEpochState/Command.hs} (85%) rename cardano-cli/src/Cardano/CLI/{Run/Debug/LogEpochState.hs => EraIndependent/Debug/LogEpochState/Run.hs} (87%) rename cardano-cli/src/Cardano/CLI/{Options/Debug.hs => EraIndependent/Debug/Option.hs} (88%) rename cardano-cli/src/Cardano/CLI/{Run/Debug.hs => EraIndependent/Debug/Run.hs} (53%) rename cardano-cli/src/Cardano/CLI/{Commands/Debug/TransactionView.hs => EraIndependent/Debug/TransactionView/Command.hs} (69%) rename cardano-cli/src/Cardano/CLI/{Run/Debug/TransactionView.hs => EraIndependent/Debug/TransactionView/Run.hs} (89%) rename cardano-cli/src/Cardano/CLI/{Commands/Hash.hs => EraIndependent/Hash/Command.hs} (95%) rename cardano-cli/src/Cardano/CLI/{Options/Hash.hs => EraIndependent/Hash/Option.hs} (94%) rename cardano-cli/src/Cardano/CLI/{Run/Hash.hs => EraIndependent/Hash/Run.hs} (97%) rename cardano-cli/src/Cardano/CLI/{Commands/Key.hs => EraIndependent/Key/Command.hs} (98%) rename cardano-cli/src/Cardano/CLI/{Options/Key.hs => EraIndependent/Key/Option.hs} (98%) rename cardano-cli/src/Cardano/CLI/{Run/Key.hs => EraIndependent/Key/Run.hs} (98%) rename cardano-cli/src/Cardano/CLI/{Commands/Node.hs => EraIndependent/Node/Command.hs} (95%) rename cardano-cli/src/Cardano/CLI/{Options/Node.hs => EraIndependent/Node/Option.hs} (94%) rename cardano-cli/src/Cardano/CLI/{Run/Node.hs => EraIndependent/Node/Run.hs} (97%) rename cardano-cli/src/Cardano/CLI/{Commands/Ping.hs => EraIndependent/Ping/Command.hs} (94%) rename cardano-cli/src/Cardano/CLI/{Options/Ping.hs => EraIndependent/Ping/Option.hs} (93%) rename cardano-cli/src/Cardano/CLI/{Run/Ping.hs => EraIndependent/Ping/Run.hs} (97%) rename cardano-cli/src/Cardano/CLI/{Helpers.hs => Helper.hs} (98%) rename cardano-cli/src/Cardano/CLI/Legacy/{Commands.hs => Command.hs} (76%) rename cardano-cli/src/Cardano/CLI/Legacy/{Commands/Genesis.hs => Genesis/Command.hs} (96%) rename cardano-cli/src/Cardano/CLI/Legacy/{Run/Genesis.hs => Genesis/Run.hs} (95%) rename cardano-cli/src/Cardano/CLI/Legacy/{Commands/Governance.hs => Governance/Command.hs} (95%) rename cardano-cli/src/Cardano/CLI/Legacy/{Run/Governance.hs => Governance/Run.hs} (92%) rename cardano-cli/src/Cardano/CLI/Legacy/{Options.hs => Option.hs} (98%) rename cardano-cli/src/Cardano/CLI/{Options.hs => Option.hs} (87%) rename cardano-cli/src/Cardano/CLI/{Orphans.hs => Orphan.hs} (97%) rename cardano-cli/src/Cardano/CLI/{Types => Type}/Common.hs (99%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/AddressCmdError.hs (91%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/AddressInfoError.hs (86%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/BootstrapWitnessError.hs (94%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/CardanoAddressSigningKeyConversionError.hs (93%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/CmdError.hs (69%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/DebugCmdError.hs (96%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/DelegationError.hs (89%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/GenesisCmdError.hs (93%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/GovernanceActionsError.hs (94%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/GovernanceCmdError.hs (96%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/GovernanceCommitteeError.hs (89%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/GovernanceQueryError.hs (95%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/GovernanceVoteCmdError.hs (90%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/HashCmdError.hs (98%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/ItnKeyConversionError.hs (96%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/KeyCmdError.hs (91%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/NodeCmdError.hs (95%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/NodeEraMismatchError.hs (81%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/PlutusScriptDecodeError.hs (94%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/ProtocolParamsError.hs (92%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/QueryCmdError.hs (95%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/RegistrationError.hs (87%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/ScriptDataError.hs (96%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/ScriptDecodeError.hs (93%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/StakeAddressCmdError.hs (77%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/StakeAddressDelegationError.hs (88%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/StakeAddressRegistrationError.hs (84%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/StakeCredentialError.hs (81%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/StakePoolCmdError.hs (93%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/TextViewFileError.hs (82%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/TxCmdError.hs (94%) rename cardano-cli/src/Cardano/CLI/{Types/Errors => Type/Error}/TxValidationError.hs (99%) rename cardano-cli/src/Cardano/CLI/{Types => Type}/Governance.hs (93%) rename cardano-cli/src/Cardano/CLI/{Types => Type}/Key.hs (99%) rename cardano-cli/src/Cardano/CLI/{Types => Type}/Key/VerificationKey.hs (93%) rename cardano-cli/src/Cardano/CLI/{Types => Type}/MonadWarning.hs (97%) rename cardano-cli/src/Cardano/CLI/{Types => Type}/Output.hs (99%) rename cardano-cli/src/Cardano/CLI/{Types => Type}/TxFeature.hs (98%) diff --git a/cardano-cli/app/cardano-cli.hs b/cardano-cli/app/cardano-cli.hs index 79cdef1250..58c88292f0 100644 --- a/cardano-cli/app/cardano-cli.hs +++ b/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 diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 204bb43de5..1f178f8539 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -50,165 +50,169 @@ 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.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 diff --git a/cardano-cli/src/Cardano/CLI/Byron/Commands.hs b/cardano-cli/src/Cardano/CLI/Byron/Command.hs similarity index 97% rename from cardano-cli/src/Cardano/CLI/Byron/Commands.hs rename to cardano-cli/src/Cardano/CLI/Byron/Command.hs index 8eacf0ea71..dcef57f0d5 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Commands.hs +++ b/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) diff --git a/cardano-cli/src/Cardano/CLI/Byron/Delegation.hs b/cardano-cli/src/Cardano/CLI/Byron/Delegation.hs index 221aceef9c..8a05648c9f 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Delegation.hs +++ b/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) diff --git a/cardano-cli/src/Cardano/CLI/Byron/Genesis.hs b/cardano-cli/src/Cardano/CLI/Byron/Genesis.hs index 172f9f42a5..bd5d96ba58 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Genesis.hs +++ b/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) diff --git a/cardano-cli/src/Cardano/CLI/Byron/Key.hs b/cardano-cli/src/Cardano/CLI/Byron/Key.hs index 1a67b7040b..c450f0b200 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Key.hs +++ b/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 (..)) diff --git a/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs b/cardano-cli/src/Cardano/CLI/Byron/Parser.hs similarity index 99% rename from cardano-cli/src/Cardano/CLI/Byron/Parsers.hs rename to cardano-cli/src/Cardano/CLI/Byron/Parser.hs index 47fc8ffb1a..40ec557486 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs +++ b/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 diff --git a/cardano-cli/src/Cardano/CLI/Byron/Run.hs b/cardano-cli/src/Cardano/CLI/Byron/Run.hs index 5d78ac4190..46f2633dac 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Run.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Run.hs @@ -13,15 +13,15 @@ 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.Command 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.CLI.Helper +import Cardano.CLI.Type.Common import Cardano.Crypto.Hashing qualified as Crypto import Cardano.Crypto.Signing qualified as Crypto diff --git a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs index 9cbfba9ae5..833a046da9 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs @@ -32,7 +32,7 @@ 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.CLI.Type.Common (TxFile) import Cardano.Crypto.Signing qualified as Crypto import Data.Bifunctor (Bifunctor (..)) diff --git a/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs b/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs index ddc03117de..a9e39d8ba0 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs @@ -25,8 +25,8 @@ import Cardano.Api.Consensus (condense, txId) 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.Types.Common +import Cardano.CLI.Helper (HelpersError, ensureNewFileLBS, renderHelpersError) +import Cardano.CLI.Type.Common import Control.Exception (Exception (..)) import Control.Tracer (stdoutTracer, traceWith) diff --git a/cardano-cli/src/Cardano/CLI/Byron/Vote.hs b/cardano-cli/src/Cardano/CLI/Byron/Vote.hs index 7b24d825f5..72af567f13 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Vote.hs @@ -22,8 +22,8 @@ import Cardano.CLI.Byron.UpdateProposal ( ByronUpdateProposalError , readByronUpdateProposal ) -import Cardano.CLI.Helpers (HelpersError, ensureNewFileLBS) -import Cardano.CLI.Types.Common +import Cardano.CLI.Helper (HelpersError, ensureNewFileLBS) +import Cardano.CLI.Type.Common import Control.Tracer (stdoutTracer, traceWith) import Data.Bifunctor (first) diff --git a/cardano-cli/src/Cardano/CLI/Commands.hs b/cardano-cli/src/Cardano/CLI/Command.hs similarity index 61% rename from cardano-cli/src/Cardano/CLI/Commands.hs rename to cardano-cli/src/Cardano/CLI/Command.hs index fd0c891d4a..ba11ac1b5c 100644 --- a/cardano-cli/src/Cardano/CLI/Commands.hs +++ b/cardano-cli/src/Cardano/CLI/Command.hs @@ -1,21 +1,21 @@ {-# LANGUAGE GADTs #-} -module Cardano.CLI.Commands +module Cardano.CLI.Command ( ClientCommand (..) ) where -import Cardano.CLI.Byron.Commands (ByronCommand) -import Cardano.CLI.Commands.Address -import Cardano.CLI.Commands.Debug -import Cardano.CLI.Commands.Hash (HashCmds) -import Cardano.CLI.Commands.Key -import Cardano.CLI.Commands.Node -import Cardano.CLI.Commands.Ping (PingCmd) -import Cardano.CLI.Compatible.Commands -import Cardano.CLI.EraBased.Commands.Query -import Cardano.CLI.EraBased.Commands.TopLevelCommands -import Cardano.CLI.Legacy.Commands +import Cardano.CLI.Byron.Command (ByronCommand) +import Cardano.CLI.EraIndependent.Address.Command +import Cardano.CLI.EraIndependent.Debug.Command +import Cardano.CLI.EraIndependent.Hash.Command (HashCmds) +import Cardano.CLI.EraIndependent.Key.Command +import Cardano.CLI.EraIndependent.Node.Command +import Cardano.CLI.EraIndependent.Ping.Command (PingCmd) +import Cardano.CLI.Compatible.Command +import Cardano.CLI.EraBased.Query.Command +import Cardano.CLI.EraBased.Command +import Cardano.CLI.Legacy.Command import Options.Applicative.Types (ParserInfo (..), ParserPrefs (..)) diff --git a/cardano-cli/src/Cardano/CLI/Commands/Debug.hs b/cardano-cli/src/Cardano/CLI/Commands/Debug.hs deleted file mode 100644 index 5448739816..0000000000 --- a/cardano-cli/src/Cardano/CLI/Commands/Debug.hs +++ /dev/null @@ -1,13 +0,0 @@ -module Cardano.CLI.Commands.Debug - ( DebugCmds (..) - ) -where - -import Cardano.CLI.Commands.Debug.CheckNodeConfiguration -import Cardano.CLI.Commands.Debug.LogEpochState -import Cardano.CLI.Commands.Debug.TransactionView - -data DebugCmds - = DebugCheckNodeConfigurationCmd CheckNodeConfigCmdArgs - | DebugLogEpochStateCmd LogEpochStateCmdArgs - | DebugTransactionViewCmd TransactionViewCmdArgs diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Command.hs b/cardano-cli/src/Cardano/CLI/Compatible/Command.hs new file mode 100644 index 0000000000..055c159ed4 --- /dev/null +++ b/cardano-cli/src/Cardano/CLI/Compatible/Command.hs @@ -0,0 +1,36 @@ +{-# LANGUAGE GADTs #-} +{-# LANGUAGE LambdaCase #-} + +{- +This module is concerned with providing backwards compatible cli commands for our internal +testing needs. The intention is to restrict as much as possible which functionality we maintain backwards +compatibility for. +-} + +module Cardano.CLI.Compatible.Command + ( AnyCompatibleCommand (..) + , CompatibleCommand (..) + , renderAnyCompatibleCommand + ) +where + +import Cardano.CLI.Compatible.Governance.Command +import Cardano.CLI.Compatible.Transaction.Command + +import Data.Text + +data AnyCompatibleCommand where + AnyCompatibleCommand :: CompatibleCommand era -> AnyCompatibleCommand + +renderAnyCompatibleCommand :: AnyCompatibleCommand -> Text +renderAnyCompatibleCommand = \case + AnyCompatibleCommand cmd -> renderCompatibleCommand cmd + +data CompatibleCommand era + = CompatibleTransactionCmd (CompatibleTransactionCmds era) + | CompatibleGovernanceCmds (CompatibleGovernanceCmds era) + +renderCompatibleCommand :: CompatibleCommand era -> Text +renderCompatibleCommand = \case + CompatibleTransactionCmd cmd -> renderCompatibleTransactionCmd cmd + CompatibleGovernanceCmds cmd -> renderCompatibleGovernanceCmds cmd diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs b/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs deleted file mode 100644 index c7e1ffbfb9..0000000000 --- a/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs +++ /dev/null @@ -1,39 +0,0 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE LambdaCase #-} - -module Cardano.CLI.Compatible.Governance - ( CompatibleGovernanceCmds (..) - , pCompatibleGovernanceCmds - , renderCompatibleGovernanceCmds - , runCompatibleGovernanceCmds - ) -where - -import Cardano.Api - -import Cardano.CLI.EraBased.Options.Governance -import Cardano.CLI.EraBased.Run.Governance -import Cardano.CLI.Types.Errors.CmdError - -import Data.Foldable -import Data.Maybe -import Data.Text -import Options.Applicative - -pCompatibleGovernanceCmds :: ShelleyBasedEra era -> Parser (CompatibleGovernanceCmds era) -pCompatibleGovernanceCmds sbe = - asum $ catMaybes [fmap CreateCompatibleProtocolUpdateCmd <$> pGovernanceCmds sbe] - --- TODO: After QA confirmms that the new compatibility commands meet their needs --- we can remove all remaining legacy commands. We can also remove/move the exising --- byron era commands under the new compatiblilty commands. -newtype CompatibleGovernanceCmds era - = CreateCompatibleProtocolUpdateCmd (GovernanceCmds era) - -runCompatibleGovernanceCmds :: CompatibleGovernanceCmds era -> ExceptT CmdError IO () -runCompatibleGovernanceCmds = \case - CreateCompatibleProtocolUpdateCmd cmd -> runGovernanceCmds cmd - -renderCompatibleGovernanceCmds :: CompatibleGovernanceCmds era -> Text -renderCompatibleGovernanceCmds = \case - CreateCompatibleProtocolUpdateCmd cmd -> renderGovernanceCmds cmd diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Governance/Command.hs b/cardano-cli/src/Cardano/CLI/Compatible/Governance/Command.hs new file mode 100644 index 0000000000..0982f0ea33 --- /dev/null +++ b/cardano-cli/src/Cardano/CLI/Compatible/Governance/Command.hs @@ -0,0 +1,22 @@ +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE LambdaCase #-} + +module Cardano.CLI.Compatible.Governance.Command + ( CompatibleGovernanceCmds (..) + , renderCompatibleGovernanceCmds + ) +where + +import Cardano.CLI.EraBased.Governance.Option + +import Data.Text + +-- TODO: After QA confirmms that the new compatibility commands meet their needs +-- we can remove all remaining legacy commands. We can also remove/move the exising +-- byron era commands under the new compatiblilty commands. +newtype CompatibleGovernanceCmds era + = CreateCompatibleProtocolUpdateCmd (GovernanceCmds era) + +renderCompatibleGovernanceCmds :: CompatibleGovernanceCmds era -> Text +renderCompatibleGovernanceCmds = \case + CreateCompatibleProtocolUpdateCmd cmd -> renderGovernanceCmds cmd diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Governance/Option.hs b/cardano-cli/src/Cardano/CLI/Compatible/Governance/Option.hs new file mode 100644 index 0000000000..6e6dac5084 --- /dev/null +++ b/cardano-cli/src/Cardano/CLI/Compatible/Governance/Option.hs @@ -0,0 +1,19 @@ +{-# LANGUAGE DataKinds #-} + +module Cardano.CLI.Compatible.Governance.Option + ( pCompatibleGovernanceCmds + ) +where + +import Cardano.Api + +import Cardano.CLI.Compatible.Governance.Command +import Cardano.CLI.EraBased.Governance.Option + +import Data.Foldable +import Data.Maybe +import Options.Applicative + +pCompatibleGovernanceCmds :: ShelleyBasedEra era -> Parser (CompatibleGovernanceCmds era) +pCompatibleGovernanceCmds sbe = + asum $ catMaybes [fmap CreateCompatibleProtocolUpdateCmd <$> pGovernanceCmds sbe] diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Governance/Run.hs b/cardano-cli/src/Cardano/CLI/Compatible/Governance/Run.hs new file mode 100644 index 0000000000..fc20f22853 --- /dev/null +++ b/cardano-cli/src/Cardano/CLI/Compatible/Governance/Run.hs @@ -0,0 +1,17 @@ +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE LambdaCase #-} + +module Cardano.CLI.Compatible.Governance.Run + ( runCompatibleGovernanceCmds + ) +where + +import Cardano.Api + +import Cardano.CLI.Compatible.Governance.Command +import Cardano.CLI.EraBased.Governance.Run +import Cardano.CLI.Type.Error.CmdError + +runCompatibleGovernanceCmds :: CompatibleGovernanceCmds era -> ExceptT CmdError IO () +runCompatibleGovernanceCmds = \case + CreateCompatibleProtocolUpdateCmd cmd -> runGovernanceCmds cmd diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Commands.hs b/cardano-cli/src/Cardano/CLI/Compatible/Option.hs similarity index 69% rename from cardano-cli/src/Cardano/CLI/Compatible/Commands.hs rename to cardano-cli/src/Cardano/CLI/Compatible/Option.hs index 6eb20fb5d4..63b3841493 100644 --- a/cardano-cli/src/Cardano/CLI/Compatible/Commands.hs +++ b/cardano-cli/src/Cardano/CLI/Compatible/Option.hs @@ -7,18 +7,20 @@ testing needs. The intention is to restrict as much as possible which functional compatibility for. -} -module Cardano.CLI.Compatible.Commands - ( AnyCompatibleCommand (..) - , CompatibleCommand (..) - , pAnyCompatibleCommand - , renderAnyCompatibleCommand +module Cardano.CLI.Compatible.Option + ( pAnyCompatibleCommand ) where import Cardano.Api -import Cardano.CLI.Compatible.Governance -import Cardano.CLI.Compatible.Transaction +import Cardano.CLI.Compatible.Governance.Run +import Cardano.CLI.Compatible.Governance.Option +import Cardano.CLI.Compatible.Governance.Command +import Cardano.CLI.Compatible.Transaction.Run +import Cardano.CLI.Compatible.Transaction.Option +import Cardano.CLI.Compatible.Transaction.Command +import Cardano.CLI.Compatible.Command import Cardano.CLI.Environment import Cardano.CLI.Parser @@ -27,22 +29,6 @@ import Data.Text import Options.Applicative import Options.Applicative qualified as Opt -data AnyCompatibleCommand where - AnyCompatibleCommand :: CompatibleCommand era -> AnyCompatibleCommand - -renderAnyCompatibleCommand :: AnyCompatibleCommand -> Text -renderAnyCompatibleCommand = \case - AnyCompatibleCommand cmd -> renderCompatibleCommand cmd - -data CompatibleCommand era - = CompatibleTransactionCmd (CompatibleTransactionCmds era) - | CompatibleGovernanceCmds (CompatibleGovernanceCmds era) - -renderCompatibleCommand :: CompatibleCommand era -> Text -renderCompatibleCommand = \case - CompatibleTransactionCmd cmd -> renderCompatibleTransactionCmd cmd - CompatibleGovernanceCmds cmd -> renderCompatibleGovernanceCmds cmd - pAnyCompatibleCommand :: EnvCli -> Parser AnyCompatibleCommand pAnyCompatibleCommand envCli = asum diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Run.hs b/cardano-cli/src/Cardano/CLI/Compatible/Run.hs index 50eb3620fe..34ca406513 100644 --- a/cardano-cli/src/Cardano/CLI/Compatible/Run.hs +++ b/cardano-cli/src/Cardano/CLI/Compatible/Run.hs @@ -12,11 +12,11 @@ where import Cardano.Api -import Cardano.CLI.Compatible.Commands -import Cardano.CLI.Compatible.Governance -import Cardano.CLI.Compatible.Transaction +import Cardano.CLI.Compatible.Command +import Cardano.CLI.Compatible.Governance.Run +import Cardano.CLI.Compatible.Transaction.Run import Cardano.CLI.Render -import Cardano.CLI.Types.Errors.CmdError +import Cardano.CLI.Type.Error.CmdError import RIO diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Transaction/Command.hs b/cardano-cli/src/Cardano/CLI/Compatible/Transaction/Command.hs new file mode 100644 index 0000000000..0f550a8830 --- /dev/null +++ b/cardano-cli/src/Cardano/CLI/Compatible/Transaction/Command.hs @@ -0,0 +1,66 @@ +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE ExistentialQuantification #-} +{-# LANGUAGE GADTs #-} +{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} + +module Cardano.CLI.Compatible.Transaction.Command + ( CompatibleTransactionCmds (..) + , renderCompatibleTransactionCmd + ) +where + +import Cardano.Api +import Cardano.Api.Compatible +import Cardano.Api.Ledger hiding (TxIn, VotingProcedures) +import Cardano.Api.Shelley hiding (VotingProcedures) + +import Cardano.CLI.Compatible.Exception +import Cardano.CLI.Environment +import Cardano.CLI.EraBased.Common.Option hiding (pRefScriptFp, pTxOutDatum) +import Cardano.CLI.EraBased.Script.Certificate.Read +import Cardano.CLI.EraBased.Script.Certificate.Type +import Cardano.CLI.EraBased.Script.Proposal.Type +import Cardano.CLI.EraBased.Script.Vote.Type + ( CliVoteScriptRequirements + , VoteScriptWitness (..) + ) +import Cardano.CLI.EraBased.Transaction.Run +import Cardano.CLI.Parser +import Cardano.CLI.Read +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.TxCmdError +import Cardano.CLI.Type.Governance +import Cardano.CLI.Type.TxFeature + +import Data.Foldable hiding (toList) +import Data.Function +import Data.Map.Strict qualified as Map +import Data.Maybe +import Data.Text (Text) +import GHC.Exts (toList) +import Options.Applicative +import Options.Applicative qualified as Opt + +-- TODO: After QA confirmms that the new compatibility commands meet their needs +-- we can remove all remaining legacy commands. We can also remove/move the exising +-- byron era commands under the new compatiblilty commands. +data CompatibleTransactionCmds era + = CreateCompatibleSignedTransaction + (ShelleyBasedEra era) + [TxIn] + [TxOutAnyEra] + !(Maybe (Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile))) + !(Maybe (Featured ConwayEraOnwards era [(ProposalFile In, Maybe CliProposalScriptRequirements)])) + ![(VoteFile In, Maybe CliVoteScriptRequirements)] + [WitnessSigningData] + -- ^ Signing keys + (Maybe NetworkId) + !Coin + -- ^ Tx fee + ![(CertificateFile, Maybe CliCertificateScriptRequirements)] + -- ^ stake registering certs + !(File () Out) + +renderCompatibleTransactionCmd :: CompatibleTransactionCmds era -> Text +renderCompatibleTransactionCmd _ = "" diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Transaction/Option.hs b/cardano-cli/src/Cardano/CLI/Compatible/Transaction/Option.hs new file mode 100644 index 0000000000..742631baab --- /dev/null +++ b/cardano-cli/src/Cardano/CLI/Compatible/Transaction/Option.hs @@ -0,0 +1,152 @@ +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE ExistentialQuantification #-} +{-# LANGUAGE GADTs #-} +{-# LANGUAGE LambdaCase #-} +{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} + +module Cardano.CLI.Compatible.Transaction.Option + ( pAllCompatibleTransactionCommands + ) +where + +import Cardano.Api + +import Cardano.CLI.Compatible.Transaction.Command +import Cardano.CLI.Environment +import Cardano.CLI.EraBased.Common.Option hiding (pRefScriptFp, pTxOutDatum) +import Cardano.CLI.Parser +import Cardano.CLI.Type.Common + +import Data.Foldable hiding (toList) +import Options.Applicative +import Options.Applicative qualified as Opt + +pAllCompatibleTransactionCommands + :: EnvCli -> ShelleyBasedEra era -> Parser (CompatibleTransactionCmds era) +pAllCompatibleTransactionCommands envCli sbe = + let allCommannds = + asum + [ pCompatibleSignedTransactionCommand envCli sbe + ] + in subParser "transaction" $ + Opt.info allCommannds $ + Opt.progDesc "Transaction commands." + +pCompatibleSignedTransactionCommand + :: EnvCli -> ShelleyBasedEra era -> Parser (CompatibleTransactionCmds era) +pCompatibleSignedTransactionCommand envCli sbe = + subParser "signed-transaction" $ + Opt.info (pCompatibleSignedTransaction envCli sbe) $ + Opt.progDesc "Create a simple signed transaction." + +pCompatibleSignedTransaction + :: EnvCli -> ShelleyBasedEra era -> Parser (CompatibleTransactionCmds era) +pCompatibleSignedTransaction env sbe = + CreateCompatibleSignedTransaction sbe + <$> many pTxInOnly + <*> many (pTxOutEraAware sbe) + <*> pFeatured (toCardanoEra sbe) (optional pUpdateProposalFile) + <*> pFeatured (toCardanoEra sbe) (many (pProposalFile ManualBalance)) + <*> pVoteFiles sbe ManualBalance + <*> many pWitnessSigningData + <*> optional (pNetworkId env) + <*> pTxFee + <*> many (pCertificateFile ManualBalance) + <*> pOutputFile + +pTxInOnly :: Parser TxIn +pTxInOnly = + Opt.option + (readerFromParsecParser parseTxIn) + ( Opt.long "tx-in" + <> Opt.metavar "TX-IN" + <> Opt.help "TxId#TxIx" + ) + +-- This parser renders the appropriate parsers depending on what +-- functionality is available per era. +pTxOutEraAware :: ShelleyBasedEra era -> Parser TxOutAnyEra +pTxOutEraAware sbe = + Opt.option + (readerFromParsecParser parseTxOutAnyEra) + ( Opt.long "tx-out" + <> Opt.metavar "ADDRESS VALUE" + -- TODO alonzo: Update the help text to describe the new syntax as well. + <> Opt.help + "The transaction output as ADDRESS VALUE where ADDRESS is \ + \the Bech32-encoded address followed by the value in \ + \the multi-asset syntax (including simply Lovelace)." + ) + <*> pTxOutDatum sbe + <*> pRefScriptFp sbe + +pTxOutDatum :: ShelleyBasedEra era -> Parser TxOutDatumAnyEra +pTxOutDatum = + caseShelleyToMaryOrAlonzoEraOnwards + (const $ pure TxOutDatumByNone) + ( \case + AlonzoEraOnwardsAlonzo -> + pAlonzoDatumFunctionality <|> pure TxOutDatumByNone + AlonzoEraOnwardsBabbage -> + pBabbageDatumFunctionality <|> pure TxOutDatumByNone + AlonzoEraOnwardsConway -> pConwayDatumFunctionality <|> pure TxOutDatumByNone + ) + where + pAlonzoDatumFunctionality = + asum + [ pTxOutDatumByHashOnly + , pTxOutDatumByHashOf + , pTxOutDatumByValue + ] + pBabbageDatumFunctionality = + asum + [ pAlonzoDatumFunctionality + , pTxOutInlineDatumByValue + ] + + pConwayDatumFunctionality = pBabbageDatumFunctionality + + pTxOutDatumByHashOnly = + fmap TxOutDatumByHashOnly $ + Opt.option (readerFromParsecParser $ parseHash (AsHash AsScriptData)) $ + mconcat + [ Opt.long "tx-out-datum-hash" + , Opt.metavar "HASH" + , Opt.help $ + mconcat + [ "The script datum hash for this tx output, as " + , "the raw datum hash (in hex)." + ] + ] + + pTxOutDatumByHashOf = + TxOutDatumByHashOf + <$> pScriptDataOrFile + "tx-out-datum-hash" + "The script datum hash for this tx output, by hashing the script datum given here." + "The script datum hash for this tx output, by hashing the script datum in the file." + + pTxOutDatumByValue = + TxOutDatumByValue + <$> pScriptDataOrFile + "tx-out-datum-embed" + "The script datum to embed in the tx for this output, given here." + "The script datum to embed in the tx for this output, in the given file." + + pTxOutInlineDatumByValue = + TxOutInlineDatumByValue + <$> pScriptDataOrFile + "tx-out-inline-datum" + "The script datum to embed in the tx output as an inline datum, given here." + "The script datum to embed in the tx output as an inline datum, in the given file." + +pRefScriptFp :: ShelleyBasedEra era -> Parser ReferenceScriptAnyEra +pRefScriptFp = + caseShelleyToBabbageOrConwayEraOnwards + (const $ pure ReferenceScriptAnyEraNone) + ( const $ + ReferenceScriptAnyEra + <$> parseFilePath "tx-out-reference-script-file" "Reference script input file." + <|> pure ReferenceScriptAnyEraNone + ) diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs b/cardano-cli/src/Cardano/CLI/Compatible/Transaction/Run.hs similarity index 51% rename from cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs rename to cardano-cli/src/Cardano/CLI/Compatible/Transaction/Run.hs index ed9cd76f36..9686d5a32f 100644 --- a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/Compatible/Transaction/Run.hs @@ -6,198 +6,34 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TupleSections #-} -module Cardano.CLI.Compatible.Transaction - ( CompatibleTransactionCmds (..) - , CompatibleTransactionError (..) - , pAllCompatibleTransactionCommands - , renderCompatibleTransactionCmd +module Cardano.CLI.Compatible.Transaction.Run + ( CompatibleTransactionError (..) , runCompatibleTransactionCmd ) where import Cardano.Api import Cardano.Api.Compatible -import Cardano.Api.Ledger hiding (TxIn, VotingProcedures) import Cardano.Api.Shelley hiding (VotingProcedures) import Cardano.CLI.Compatible.Exception -import Cardano.CLI.Environment -import Cardano.CLI.EraBased.Options.Common hiding (pRefScriptFp, pTxOutDatum) -import Cardano.CLI.EraBased.Run.Transaction +import Cardano.CLI.Compatible.Transaction.Command +import Cardano.CLI.EraBased.Transaction.Run import Cardano.CLI.EraBased.Script.Certificate.Read -import Cardano.CLI.EraBased.Script.Certificate.Types -import Cardano.CLI.EraBased.Script.Proposal.Types -import Cardano.CLI.EraBased.Script.Vote.Types - ( CliVoteScriptRequirements - , VoteScriptWitness (..) +import Cardano.CLI.EraBased.Script.Certificate.Type +import Cardano.CLI.EraBased.Script.Proposal.Type +import Cardano.CLI.EraBased.Script.Vote.Type + ( VoteScriptWitness (..) ) -import Cardano.CLI.Parser import Cardano.CLI.Read -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.TxCmdError -import Cardano.CLI.Types.Governance -import Cardano.CLI.Types.TxFeature +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.TxCmdError +import Cardano.CLI.Type.TxFeature -import Data.Foldable hiding (toList) import Data.Function import Data.Map.Strict qualified as Map import Data.Maybe -import Data.Text (Text) import GHC.Exts (toList) -import Options.Applicative -import Options.Applicative qualified as Opt - -pAllCompatibleTransactionCommands - :: EnvCli -> ShelleyBasedEra era -> Parser (CompatibleTransactionCmds era) -pAllCompatibleTransactionCommands envCli sbe = - let allCommannds = - asum - [ pCompatibleSignedTransactionCommand envCli sbe - ] - in subParser "transaction" $ - Opt.info allCommannds $ - Opt.progDesc "Transaction commands." - -pCompatibleSignedTransactionCommand - :: EnvCli -> ShelleyBasedEra era -> Parser (CompatibleTransactionCmds era) -pCompatibleSignedTransactionCommand envCli sbe = - subParser "signed-transaction" $ - Opt.info (pCompatibleSignedTransaction envCli sbe) $ - Opt.progDesc "Create a simple signed transaction." - -pCompatibleSignedTransaction - :: EnvCli -> ShelleyBasedEra era -> Parser (CompatibleTransactionCmds era) -pCompatibleSignedTransaction env sbe = - CreateCompatibleSignedTransaction sbe - <$> many pTxInOnly - <*> many (pTxOutEraAware sbe) - <*> pFeatured (toCardanoEra sbe) (optional pUpdateProposalFile) - <*> pFeatured (toCardanoEra sbe) (many (pProposalFile ManualBalance)) - <*> pVoteFiles sbe ManualBalance - <*> many pWitnessSigningData - <*> optional (pNetworkId env) - <*> pTxFee - <*> many (pCertificateFile ManualBalance) - <*> pOutputFile - -pTxInOnly :: Parser TxIn -pTxInOnly = - Opt.option - (readerFromParsecParser parseTxIn) - ( Opt.long "tx-in" - <> Opt.metavar "TX-IN" - <> Opt.help "TxId#TxIx" - ) - --- This parser renders the appropriate parsers depending on what --- functionality is available per era. -pTxOutEraAware :: ShelleyBasedEra era -> Parser TxOutAnyEra -pTxOutEraAware sbe = - Opt.option - (readerFromParsecParser parseTxOutAnyEra) - ( Opt.long "tx-out" - <> Opt.metavar "ADDRESS VALUE" - -- TODO alonzo: Update the help text to describe the new syntax as well. - <> Opt.help - "The transaction output as ADDRESS VALUE where ADDRESS is \ - \the Bech32-encoded address followed by the value in \ - \the multi-asset syntax (including simply Lovelace)." - ) - <*> pTxOutDatum sbe - <*> pRefScriptFp sbe - -pTxOutDatum :: ShelleyBasedEra era -> Parser TxOutDatumAnyEra -pTxOutDatum = - caseShelleyToMaryOrAlonzoEraOnwards - (const $ pure TxOutDatumByNone) - ( \case - AlonzoEraOnwardsAlonzo -> - pAlonzoDatumFunctionality <|> pure TxOutDatumByNone - AlonzoEraOnwardsBabbage -> - pBabbageDatumFunctionality <|> pure TxOutDatumByNone - AlonzoEraOnwardsConway -> pConwayDatumFunctionality <|> pure TxOutDatumByNone - ) - where - pAlonzoDatumFunctionality = - asum - [ pTxOutDatumByHashOnly - , pTxOutDatumByHashOf - , pTxOutDatumByValue - ] - pBabbageDatumFunctionality = - asum - [ pAlonzoDatumFunctionality - , pTxOutInlineDatumByValue - ] - - pConwayDatumFunctionality = pBabbageDatumFunctionality - - pTxOutDatumByHashOnly = - fmap TxOutDatumByHashOnly $ - Opt.option (readerFromParsecParser $ parseHash (AsHash AsScriptData)) $ - mconcat - [ Opt.long "tx-out-datum-hash" - , Opt.metavar "HASH" - , Opt.help $ - mconcat - [ "The script datum hash for this tx output, as " - , "the raw datum hash (in hex)." - ] - ] - - pTxOutDatumByHashOf = - TxOutDatumByHashOf - <$> pScriptDataOrFile - "tx-out-datum-hash" - "The script datum hash for this tx output, by hashing the script datum given here." - "The script datum hash for this tx output, by hashing the script datum in the file." - - pTxOutDatumByValue = - TxOutDatumByValue - <$> pScriptDataOrFile - "tx-out-datum-embed" - "The script datum to embed in the tx for this output, given here." - "The script datum to embed in the tx for this output, in the given file." - - pTxOutInlineDatumByValue = - TxOutInlineDatumByValue - <$> pScriptDataOrFile - "tx-out-inline-datum" - "The script datum to embed in the tx output as an inline datum, given here." - "The script datum to embed in the tx output as an inline datum, in the given file." - -pRefScriptFp :: ShelleyBasedEra era -> Parser ReferenceScriptAnyEra -pRefScriptFp = - caseShelleyToBabbageOrConwayEraOnwards - (const $ pure ReferenceScriptAnyEraNone) - ( const $ - ReferenceScriptAnyEra - <$> parseFilePath "tx-out-reference-script-file" "Reference script input file." - <|> pure ReferenceScriptAnyEraNone - ) - --- TODO: After QA confirmms that the new compatibility commands meet their needs --- we can remove all remaining legacy commands. We can also remove/move the exising --- byron era commands under the new compatiblilty commands. -data CompatibleTransactionCmds era - = CreateCompatibleSignedTransaction - (ShelleyBasedEra era) - [TxIn] - [TxOutAnyEra] - !(Maybe (Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile))) - !(Maybe (Featured ConwayEraOnwards era [(ProposalFile In, Maybe CliProposalScriptRequirements)])) - ![(VoteFile In, Maybe CliVoteScriptRequirements)] - [WitnessSigningData] - -- ^ Signing keys - (Maybe NetworkId) - !Coin - -- ^ Tx fee - ![(CertificateFile, Maybe CliCertificateScriptRequirements)] - -- ^ stake registering certs - !(File () Out) - -renderCompatibleTransactionCmd :: CompatibleTransactionCmds era -> Text -renderCompatibleTransactionCmd _ = "" data CompatibleTransactionError = forall err. Error err => CompatibleFileError (FileError err) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/TopLevelCommands.hs b/cardano-cli/src/Cardano/CLI/EraBased/Command.hs similarity index 71% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/TopLevelCommands.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Command.hs index 627aa83c50..35a98fd60b 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/TopLevelCommands.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Command.hs @@ -1,7 +1,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.TopLevelCommands +module Cardano.CLI.EraBased.Command ( AnyEraCommand (..) , Cmds (..) , renderAnyEraCommand @@ -11,16 +11,16 @@ where import Cardano.Api (ShelleyBasedEra (..)) -import Cardano.CLI.Commands.Address -import Cardano.CLI.Commands.Key -import Cardano.CLI.Commands.Node -import Cardano.CLI.EraBased.Commands.Genesis -import Cardano.CLI.EraBased.Commands.Query -import Cardano.CLI.EraBased.Commands.StakeAddress -import Cardano.CLI.EraBased.Commands.StakePool -import Cardano.CLI.EraBased.Commands.TextView -import Cardano.CLI.EraBased.Commands.Transaction -import Cardano.CLI.EraBased.Options.Governance (GovernanceCmds, renderGovernanceCmds) +import Cardano.CLI.EraIndependent.Address.Command +import Cardano.CLI.EraIndependent.Key.Command +import Cardano.CLI.EraIndependent.Node.Command +import Cardano.CLI.EraBased.Genesis.Command +import Cardano.CLI.EraBased.Query.Command +import Cardano.CLI.EraBased.StakeAddress.Command +import Cardano.CLI.EraBased.StakePool.Command +import Cardano.CLI.EraBased.TextView.Command +import Cardano.CLI.EraBased.Transaction.Command +import Cardano.CLI.EraBased.Governance.Option (GovernanceCmds, renderGovernanceCmds) import Data.Text (Text) import Data.Typeable (Typeable) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Common/Option.hs similarity index 99% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Common/Option.hs index 3f6a132f64..47225a5588 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Common/Option.hs @@ -10,7 +10,7 @@ {- HLINT ignore "Use <$>" -} {- HLINT ignore "Move brackets to avoid $" -} -module Cardano.CLI.EraBased.Options.Common where +module Cardano.CLI.EraBased.Common.Option where import Cardano.Api import Cardano.Api.Ledger qualified as L @@ -18,23 +18,23 @@ import Cardano.Api.Network qualified as Consensus import Cardano.Api.Shelley import Cardano.CLI.Environment (EnvCli (..), envCliAnyEon) -import Cardano.CLI.EraBased.Script.Certificate.Types (CliCertificateScriptRequirements) -import Cardano.CLI.EraBased.Script.Certificate.Types qualified as Certifying -import Cardano.CLI.EraBased.Script.Mint.Types -import Cardano.CLI.EraBased.Script.Proposal.Types (CliProposalScriptRequirements) -import Cardano.CLI.EraBased.Script.Proposal.Types qualified as Proposing -import Cardano.CLI.EraBased.Script.Spend.Types (CliSpendScriptRequirements) -import Cardano.CLI.EraBased.Script.Spend.Types qualified as PlutusSpend -import Cardano.CLI.EraBased.Script.Vote.Types (CliVoteScriptRequirements) -import Cardano.CLI.EraBased.Script.Vote.Types qualified as Voting -import Cardano.CLI.EraBased.Script.Withdrawal.Types (CliWithdrawalScriptRequirements) -import Cardano.CLI.EraBased.Script.Withdrawal.Types qualified as Withdrawal +import Cardano.CLI.EraBased.Script.Certificate.Type (CliCertificateScriptRequirements) +import Cardano.CLI.EraBased.Script.Certificate.Type qualified as Certifying +import Cardano.CLI.EraBased.Script.Mint.Type +import Cardano.CLI.EraBased.Script.Proposal.Type (CliProposalScriptRequirements) +import Cardano.CLI.EraBased.Script.Proposal.Type qualified as Proposing +import Cardano.CLI.EraBased.Script.Spend.Type (CliSpendScriptRequirements) +import Cardano.CLI.EraBased.Script.Spend.Type qualified as PlutusSpend +import Cardano.CLI.EraBased.Script.Vote.Type (CliVoteScriptRequirements) +import Cardano.CLI.EraBased.Script.Vote.Type qualified as Voting +import Cardano.CLI.EraBased.Script.Withdrawal.Type (CliWithdrawalScriptRequirements) +import Cardano.CLI.EraBased.Script.Withdrawal.Type qualified as Withdrawal import Cardano.CLI.Parser import Cardano.CLI.Read -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Governance -import Cardano.CLI.Types.Key -import Cardano.CLI.Types.Key.VerificationKey +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Governance +import Cardano.CLI.Type.Key +import Cardano.CLI.Type.Key.VerificationKey import Control.Monad (void, when) import Data.Aeson qualified as Aeson diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/Command.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/Genesis.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Genesis/Command.hs index b51d2dadbb..21183f26cc 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Genesis.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/Command.hs @@ -3,7 +3,7 @@ {-# LANGUAGE ExistentialQuantification #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.Genesis +module Cardano.CLI.EraBased.Genesis.Command ( GenesisCmds (..) , GenesisCreateCmdArgs (..) , GenesisCreateCardanoCmdArgs (..) @@ -24,7 +24,7 @@ import Cardano.Api.Experimental qualified as Exp import Cardano.Api.Ledger (Coin) import Cardano.Api.Shelley -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/CreateTestnetData/Run.hs similarity index 97% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Genesis/CreateTestnetData/Run.hs index 82d1e7df85..f8fb1f266e 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/CreateTestnetData/Run.hs @@ -12,7 +12,7 @@ {-# LANGUAGE TupleSections #-} {-# LANGUAGE TypeApplications #-} -module Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData +module Cardano.CLI.EraBased.Genesis.CreateTestnetData.Run ( runGenesisKeyGenUTxOCmd , runGenesisKeyGenGenesisCmd , runGenesisKeyGenDelegateCmd @@ -54,29 +54,29 @@ import Cardano.Api.Shelley import Cardano.CLI.Byron.Genesis (NewDirectory (NewDirectory)) import Cardano.CLI.Byron.Genesis qualified as Byron -import Cardano.CLI.Commands.Node qualified as Cmd -import Cardano.CLI.EraBased.Commands.Genesis as Cmd -import Cardano.CLI.EraBased.Commands.Governance.Committee qualified as CC -import Cardano.CLI.EraBased.Commands.Governance.DRep qualified as DRep -import Cardano.CLI.EraBased.Run.Genesis.Byron as Byron -import Cardano.CLI.EraBased.Run.Genesis.Common -import Cardano.CLI.EraBased.Run.Governance.Committee qualified as CC -import Cardano.CLI.EraBased.Run.Governance.DRep qualified as DRep -import Cardano.CLI.EraBased.Run.StakeAddress (runStakeAddressKeyGenCmd) +import Cardano.CLI.EraIndependent.Node.Command qualified as Cmd +import Cardano.CLI.EraBased.Genesis.Command as Cmd +import Cardano.CLI.EraBased.Governance.Committee.Command qualified as CC +import Cardano.CLI.EraBased.Governance.DRep.Command qualified as DRep +import Cardano.CLI.EraBased.Genesis.Internal.Byron as Byron +import Cardano.CLI.EraBased.Genesis.Internal.Common +import Cardano.CLI.EraBased.Governance.Committee.Run qualified as CC +import Cardano.CLI.EraBased.Governance.DRep.Run qualified as DRep +import Cardano.CLI.EraBased.StakeAddress.Run (runStakeAddressKeyGenCmd) import Cardano.CLI.IO.Lazy qualified as Lazy -import Cardano.CLI.Run.Address (generateAndWriteKeyFiles) -import Cardano.CLI.Run.Key qualified as Key -import Cardano.CLI.Run.Node +import Cardano.CLI.EraIndependent.Address.Run (generateAndWriteKeyFiles) +import Cardano.CLI.EraIndependent.Key.Run qualified as Key +import Cardano.CLI.EraIndependent.Node.Run ( runNodeIssueOpCertCmd , runNodeKeyGenColdCmd , runNodeKeyGenKesCmd , runNodeKeyGenVrfCmd ) -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.GenesisCmdError -import Cardano.CLI.Types.Errors.NodeCmdError -import Cardano.CLI.Types.Errors.StakePoolCmdError -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.GenesisCmdError +import Cardano.CLI.Type.Error.NodeCmdError +import Cardano.CLI.Type.Error.StakePoolCmdError +import Cardano.CLI.Type.Key import Cardano.Crypto.Hash qualified as Crypto import Cardano.Prelude (canonicalEncodePretty) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Byron.hs b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/Internal/Byron.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Byron.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Genesis/Internal/Byron.hs index bf449ef813..48c6f1cc1b 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Byron.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/Internal/Byron.hs @@ -2,7 +2,7 @@ {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE TypeApplications #-} -module Cardano.CLI.EraBased.Run.Genesis.Byron where +module Cardano.CLI.EraBased.Genesis.Internal.Byron where import Cardano.Api.Byron (rationalToLovelacePortion) import Cardano.Api.Byron qualified as Byron hiding (GenesisParameters) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/Internal/Common.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Common.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Genesis/Internal/Common.hs index b57d47e9c7..36525c1026 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/Internal/Common.hs @@ -8,7 +8,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} -module Cardano.CLI.EraBased.Run.Genesis.Common +module Cardano.CLI.EraBased.Genesis.Internal.Common ( decodeShelleyGenesisFile , decodeAlonzoGenesisFile , decodeConwayGenesisFile @@ -26,9 +26,9 @@ import Cardano.Api.Ledger (AlonzoGenesis, ConwayGenesis, StandardCrypto) import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley (ShelleyGenesis, ShelleyLedgerEra, decodeAlonzoGenesis) -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.GenesisCmdError -import Cardano.CLI.Types.Errors.ProtocolParamsError +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.GenesisCmdError +import Cardano.CLI.Type.Error.ProtocolParamsError import Cardano.Crypto.Hash (HashAlgorithm) import Cardano.Crypto.Hash qualified as Hash import Cardano.Crypto.Random qualified as Crypto diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/Option.hs similarity index 99% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Genesis/Option.hs index 717dfdc424..a22860df15 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/Option.hs @@ -4,7 +4,7 @@ {-# LANGUAGE NumericUnderscores #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.EraBased.Options.Genesis +module Cardano.CLI.EraBased.Genesis.Option ( pGenesisCmds ) where @@ -15,10 +15,10 @@ import Cardano.Api.Experimental qualified as Exp import Cardano.Api.Ledger (Coin (..)) import Cardano.CLI.Environment (EnvCli (..)) -import Cardano.CLI.EraBased.Commands.Genesis -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.Genesis.Command +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Maybe import Data.Word (Word64) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/Run.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Genesis/Run.hs index 67eb0b1f5e..c5dffc7bdd 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Genesis/Run.hs @@ -14,7 +14,7 @@ {-# LANGUAGE TypeApplications #-} {-# OPTIONS_GHC -Wno-unticked-promoted-constructors #-} -module Cardano.CLI.EraBased.Run.Genesis +module Cardano.CLI.EraBased.Genesis.Run ( runGenesisCmds , runGenesisAddrCmd , runGenesisCreateCardanoCmd @@ -41,24 +41,24 @@ import Cardano.Api.Shelley import Cardano.CLI.Byron.Delegation import Cardano.CLI.Byron.Genesis as Byron import Cardano.CLI.Byron.Key qualified as Byron -import Cardano.CLI.Commands.Node qualified as Cmd -import Cardano.CLI.EraBased.Commands.Genesis as Cmd -import Cardano.CLI.EraBased.Run.Genesis.Common -import Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData (WriteFileGenesis (..)) -import Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData qualified as TN -import Cardano.CLI.EraBased.Run.StakeAddress (runStakeAddressKeyGenCmd) +import Cardano.CLI.EraIndependent.Node.Command qualified as Cmd +import Cardano.CLI.EraBased.Genesis.Command as Cmd +import Cardano.CLI.EraBased.Genesis.Internal.Common +import Cardano.CLI.EraBased.Genesis.CreateTestnetData.Run (WriteFileGenesis (..)) +import Cardano.CLI.EraBased.Genesis.CreateTestnetData.Run qualified as TN +import Cardano.CLI.EraBased.StakeAddress.Run (runStakeAddressKeyGenCmd) import Cardano.CLI.IO.Lazy qualified as Lazy -import Cardano.CLI.Run.Node +import Cardano.CLI.EraIndependent.Node.Run ( runNodeIssueOpCertCmd , runNodeKeyGenColdCmd , runNodeKeyGenKesCmd , runNodeKeyGenVrfCmd ) -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.GenesisCmdError -import Cardano.CLI.Types.Errors.NodeCmdError -import Cardano.CLI.Types.Errors.StakePoolCmdError -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.GenesisCmdError +import Cardano.CLI.Type.Error.NodeCmdError +import Cardano.CLI.Type.Error.StakePoolCmdError +import Cardano.CLI.Type.Key import Cardano.Crypto qualified as CC import Cardano.Crypto.Hash qualified as Crypto import Cardano.Crypto.Signing qualified as Byron diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Command.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Command.hs index 27a475ecfb..39f435d199 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Command.hs @@ -5,7 +5,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE StandaloneDeriving #-} -module Cardano.CLI.EraBased.Commands.Governance.Actions +module Cardano.CLI.EraBased.Governance.Actions.Command ( GovernanceActionCmds (..) , GovernanceActionUpdateCommitteeCmdArgs (..) , GovernanceActionCreateConstitutionCmdArgs (..) @@ -26,8 +26,8 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Key import Data.Text (Text) import Data.Word diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Option.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Option.hs index e8bfade68f..0ee05058ec 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Option.hs @@ -2,7 +2,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Options.Governance.Actions +module Cardano.CLI.EraBased.Governance.Actions.Option ( pGovernanceActionCmds ) where @@ -11,10 +11,10 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Commands.Governance.Actions qualified as Cmd -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.Governance.Actions.Command qualified as Cmd +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Foldable import GHC.Natural (Natural) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Run.hs similarity index 97% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Run.hs index ece7008d20..90519fb68b 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Run.hs @@ -6,7 +6,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} -module Cardano.CLI.EraBased.Run.Governance.Actions +module Cardano.CLI.EraBased.Governance.Actions.Run ( runGovernanceActionCmds , GovernanceActionsError (..) , addCostModelsToEraBasedProtocolParametersUpdate @@ -18,15 +18,15 @@ import Cardano.Api.Ledger (StrictMaybe (..)) import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Commands.Governance.Actions -import Cardano.CLI.EraBased.Commands.Governance.Actions qualified as Cmd +import Cardano.CLI.EraBased.Governance.Actions.Command +import Cardano.CLI.EraBased.Governance.Actions.Command qualified as Cmd import Cardano.CLI.Json.Friendly import Cardano.CLI.Read -import Cardano.CLI.Run.Hash (getByteStringFromURL, httpsAndIpfsSchemes) -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.GovernanceActionsError -import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError) -import Cardano.CLI.Types.Key +import Cardano.CLI.EraIndependent.Hash.Run (getByteStringFromURL, httpsAndIpfsSchemes) +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.GovernanceActionsError +import Cardano.CLI.Type.Error.HashCmdError (FetchURLError) +import Cardano.CLI.Type.Key import Control.Monad import GHC.Exts (IsList (..)) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Command.hs similarity index 84% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Command.hs index 9f452842ff..cba595bf8e 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Command.hs @@ -2,7 +2,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.Governance +module Cardano.CLI.EraBased.Governance.Command ( GovernanceCmds (..) , renderGovernanceCmds ) @@ -12,12 +12,12 @@ import Cardano.Api import Cardano.Api.Ledger (Coin) import Cardano.Api.Shelley (VrfKey) -import Cardano.CLI.EraBased.Commands.Governance.Actions -import Cardano.CLI.EraBased.Commands.Governance.Committee -import Cardano.CLI.EraBased.Commands.Governance.DRep -import Cardano.CLI.EraBased.Commands.Governance.Poll -import Cardano.CLI.EraBased.Commands.Governance.Vote -import Cardano.CLI.Types.Key (VerificationKeyOrHashOrFile) +import Cardano.CLI.EraBased.Governance.Actions.Command +import Cardano.CLI.EraBased.Governance.Committee.Command +import Cardano.CLI.EraBased.Governance.DRep.Command +import Cardano.CLI.EraBased.Governance.Poll.Command +import Cardano.CLI.EraBased.Governance.Vote.Command +import Cardano.CLI.Type.Key (VerificationKeyOrHashOrFile) import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Committee.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Command.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Committee.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Command.hs index 7d3202c9d0..aecb89fd63 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Committee.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Command.hs @@ -2,7 +2,7 @@ {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.Governance.Committee +module Cardano.CLI.EraBased.Governance.Committee.Command ( GovernanceCommitteeCmds (..) , GovernanceCommitteeKeyGenColdCmdArgs (..) , GovernanceCommitteeKeyGenHotCmdArgs (..) @@ -17,9 +17,9 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.Types.Common (PotentiallyCheckedAnchor, ResignationMetadataUrl) -import Cardano.CLI.Types.Key -import Cardano.CLI.Types.Key.VerificationKey +import Cardano.CLI.Type.Common (PotentiallyCheckedAnchor, ResignationMetadataUrl) +import Cardano.CLI.Type.Key +import Cardano.CLI.Type.Key.VerificationKey import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Option.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Option.hs index de83d0c833..d896e442c3 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Option.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeFamilies #-} -module Cardano.CLI.EraBased.Options.Governance.Committee +module Cardano.CLI.EraBased.Governance.Committee.Option ( pGovernanceCommitteeCmds ) where @@ -9,11 +9,11 @@ where import Cardano.Api import Cardano.Api.Ledger qualified as L -import Cardano.CLI.EraBased.Commands.Governance.Committee -import Cardano.CLI.EraBased.Options.Common hiding (pAnchorUrl) +import Cardano.CLI.EraBased.Governance.Committee.Command +import Cardano.CLI.EraBased.Common.Option hiding (pAnchorUrl) import Cardano.CLI.Parser import Cardano.CLI.Read -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Key import Data.Foldable (asum) import Options.Applicative (Parser, optional) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Committee.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Run.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Committee.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Run.hs index 834b39c06b..e443342a5c 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Committee.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Run.hs @@ -3,7 +3,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} -module Cardano.CLI.EraBased.Run.Governance.Committee +module Cardano.CLI.EraBased.Governance.Committee.Run ( runGovernanceCommitteeCmds , runGovernanceCommitteeKeyGenCold , runGovernanceCommitteeKeyGenHot @@ -14,14 +14,14 @@ where import Cardano.Api import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Commands.Governance.Committee -import Cardano.CLI.EraBased.Commands.Governance.Committee qualified as Cmd +import Cardano.CLI.EraBased.Governance.Committee.Command +import Cardano.CLI.EraBased.Governance.Committee.Command qualified as Cmd import Cardano.CLI.Read (readVerificationKeySource) -import Cardano.CLI.Run.Hash (carryHashChecks) -import Cardano.CLI.Run.Key qualified as Key -import Cardano.CLI.Types.Common (PotentiallyCheckedAnchor (..)) -import Cardano.CLI.Types.Errors.GovernanceCommitteeError -import Cardano.CLI.Types.Key.VerificationKey +import Cardano.CLI.EraIndependent.Hash.Run (carryHashChecks) +import Cardano.CLI.EraIndependent.Key.Run qualified as Key +import Cardano.CLI.Type.Common (PotentiallyCheckedAnchor (..)) +import Cardano.CLI.Type.Error.GovernanceCommitteeError +import Cardano.CLI.Type.Key.VerificationKey import Control.Monad (void) import Data.ByteString (ByteString) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Command.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Command.hs index f37e9256f3..894c3e966f 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Command.hs @@ -2,7 +2,7 @@ {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.Governance.DRep +module Cardano.CLI.EraBased.Governance.DRep.Command ( GovernanceDRepCmds (..) , renderGovernanceDRepCmds , GovernanceDRepKeyGenCmdArgs (..) @@ -18,9 +18,9 @@ where import Cardano.Api import Cardano.Api.Ledger qualified as L -import Cardano.CLI.Commands.Hash (HashGoal) -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Key +import Cardano.CLI.EraIndependent.Hash.Command (HashGoal) +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Key import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Option.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Option.hs index 59d02fdfcc..30e7cf0abb 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Option.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.EraBased.Options.Governance.DRep +module Cardano.CLI.EraBased.Governance.DRep.Option ( pGovernanceDRepCmds , pUpdateCertificateCmd ) @@ -11,12 +11,12 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley (Hash (DRepMetadataHash)) -import Cardano.CLI.Commands.Hash (HashGoal (..)) -import Cardano.CLI.EraBased.Commands.Governance.DRep -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraIndependent.Hash.Command (HashGoal (..)) +import Cardano.CLI.EraBased.Governance.DRep.Command +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser import Cardano.CLI.Read -import Cardano.CLI.Types.Common hiding (CheckHash) +import Cardano.CLI.Type.Common hiding (CheckHash) import Control.Applicative (Alternative ((<|>)), optional) import Data.Foldable (asum) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Run.hs similarity index 92% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Run.hs index 0b7f167a8e..368b302f25 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Run.hs @@ -9,7 +9,7 @@ {- HLINT ignore "Use let" -} -module Cardano.CLI.EraBased.Run.Governance.DRep +module Cardano.CLI.EraBased.Governance.DRep.Run ( runGovernanceDRepCmds , runGovernanceDRepKeyGenCmd ) @@ -18,16 +18,16 @@ where import Cardano.Api import Cardano.Api.Ledger qualified as L -import Cardano.CLI.Commands.Hash qualified as Cmd -import Cardano.CLI.EraBased.Commands.Governance.DRep qualified as Cmd -import Cardano.CLI.Run.Hash (allSchemes, carryHashChecks, getByteStringFromURL) -import Cardano.CLI.Run.Key qualified as Key -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.CmdError -import Cardano.CLI.Types.Errors.GovernanceCmdError -import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError) -import Cardano.CLI.Types.Errors.RegistrationError -import Cardano.CLI.Types.Key +import Cardano.CLI.EraIndependent.Hash.Command qualified as Cmd +import Cardano.CLI.EraBased.Governance.DRep.Command qualified as Cmd +import Cardano.CLI.EraIndependent.Hash.Run (allSchemes, carryHashChecks, getByteStringFromURL) +import Cardano.CLI.EraIndependent.Key.Run qualified as Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.CmdError +import Cardano.CLI.Type.Error.GovernanceCmdError +import Cardano.CLI.Type.Error.HashCmdError (FetchURLError) +import Cardano.CLI.Type.Error.RegistrationError +import Cardano.CLI.Type.Key import Control.Monad (void) import Data.ByteString (ByteString) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/GenesisKeyDelegationCertificate/Run.hs similarity index 90% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/GenesisKeyDelegationCertificate/Run.hs index ddc007650a..e58b8c73c1 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/GenesisKeyDelegationCertificate/Run.hs @@ -3,7 +3,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.EraBased.Run.Governance.GenesisKeyDelegationCertificate +module Cardano.CLI.EraBased.Governance.GenesisKeyDelegationCertificate.Run ( runGovernanceGenesisKeyDelegationCertificate ) where @@ -11,8 +11,8 @@ where import Cardano.Api import Cardano.Api.Shelley -import Cardano.CLI.Types.Errors.GovernanceCmdError -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Error.GovernanceCmdError +import Cardano.CLI.Type.Key runGovernanceGenesisKeyDelegationCertificate :: forall era diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Option.hs similarity index 90% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Option.hs index c623d85c2b..3b3ac9ea3f 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Option.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.EraBased.Options.Governance +module Cardano.CLI.EraBased.Governance.Option ( GovernanceCmds (..) , renderGovernanceCmds , pGovernanceCmds @@ -10,13 +10,13 @@ where import Cardano.Api (ShelleyBasedEra, ShelleyToBabbageEra, forShelleyBasedEraMaybeEon) -import Cardano.CLI.EraBased.Commands.Governance -import Cardano.CLI.EraBased.Options.Common -import Cardano.CLI.EraBased.Options.Governance.Actions -import Cardano.CLI.EraBased.Options.Governance.Committee -import Cardano.CLI.EraBased.Options.Governance.DRep -import Cardano.CLI.EraBased.Options.Governance.Poll -import Cardano.CLI.EraBased.Options.Governance.Vote +import Cardano.CLI.EraBased.Governance.Command +import Cardano.CLI.EraBased.Common.Option +import Cardano.CLI.EraBased.Governance.Actions.Option +import Cardano.CLI.EraBased.Governance.Committee.Option +import Cardano.CLI.EraBased.Governance.DRep.Option +import Cardano.CLI.EraBased.Governance.Poll.Option +import Cardano.CLI.EraBased.Governance.Vote.Option import Cardano.CLI.Parser import Data.Foldable diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Poll.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Poll/Command.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Poll.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Poll/Command.hs index fa0ee367cb..6198375459 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Poll.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Poll/Command.hs @@ -2,7 +2,7 @@ {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.Governance.Poll +module Cardano.CLI.EraBased.Governance.Poll.Command ( GovernancePollCmds (..) , renderGovernancePollCmds , GovernanceCreatePollCmdArgs (..) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Poll.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Poll/Option.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Poll.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Poll/Option.hs index 18ff434f82..ec6ff0291d 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Poll.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Poll/Option.hs @@ -1,12 +1,12 @@ -module Cardano.CLI.EraBased.Options.Governance.Poll +module Cardano.CLI.EraBased.Governance.Poll.Option ( pGovernancePollCmds ) where import Cardano.Api -import Cardano.CLI.EraBased.Commands.Governance.Poll qualified as Cmd -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.Governance.Poll.Command qualified as Cmd +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser import Cardano.Prelude (catMaybes, isInfixOf) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Poll.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Poll/Run.hs similarity index 97% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Poll.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Poll/Run.hs index 9dc093f558..3e4ee08757 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Poll.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Poll/Run.hs @@ -4,7 +4,7 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.EraBased.Run.Governance.Poll +module Cardano.CLI.EraBased.Governance.Poll.Run ( runGovernancePollCmds , runGovernanceCreatePollCmd , runGovernanceAnswerPollCmd @@ -15,9 +15,9 @@ where import Cardano.Api import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Commands.Governance.Poll qualified as Cmd +import Cardano.CLI.EraBased.Governance.Poll.Command qualified as Cmd import Cardano.CLI.Read -import Cardano.CLI.Types.Errors.GovernanceCmdError +import Cardano.CLI.Type.Error.GovernanceCmdError import Control.Monad import Data.ByteString.Char8 qualified as BSC diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Run.hs similarity index 89% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Run.hs index 68e578d963..1d5cd28b73 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Run.hs @@ -7,7 +7,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.EraBased.Run.Governance +module Cardano.CLI.EraBased.Governance.Run ( runGovernanceCmds , runGovernanceMIRCertificatePayStakeAddrs , runGovernanceCreateMirCertificateTransferToTreasuryCmd @@ -19,15 +19,15 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Commands.Governance qualified as Cmd -import Cardano.CLI.EraBased.Run.Governance.Actions -import Cardano.CLI.EraBased.Run.Governance.Committee -import Cardano.CLI.EraBased.Run.Governance.DRep -import Cardano.CLI.EraBased.Run.Governance.GenesisKeyDelegationCertificate -import Cardano.CLI.EraBased.Run.Governance.Poll -import Cardano.CLI.EraBased.Run.Governance.Vote -import Cardano.CLI.Types.Errors.CmdError -import Cardano.CLI.Types.Errors.GovernanceCmdError +import Cardano.CLI.EraBased.Governance.Command qualified as Cmd +import Cardano.CLI.EraBased.Governance.Actions.Run +import Cardano.CLI.EraBased.Governance.Committee.Run +import Cardano.CLI.EraBased.Governance.DRep.Run +import Cardano.CLI.EraBased.Governance.GenesisKeyDelegationCertificate.Run +import Cardano.CLI.EraBased.Governance.Poll.Run +import Cardano.CLI.EraBased.Governance.Vote.Run +import Cardano.CLI.Type.Error.CmdError +import Cardano.CLI.Type.Error.GovernanceCmdError import Control.Monad import Data.Function diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Vote/Command.hs similarity index 92% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Vote/Command.hs index f2480ee8f2..85d0262be5 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Vote/Command.hs @@ -3,7 +3,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.Governance.Vote +module Cardano.CLI.EraBased.Governance.Vote.Command ( GovernanceVoteCmds (..) , GovernanceVoteViewCmdArgs (..) , GovernanceVoteCreateCmdArgs (..) @@ -14,8 +14,8 @@ where import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Governance +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Governance import Data.Text (Text) import Data.Word diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Vote/Option.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Vote/Option.hs index 449345035b..cfe65d033c 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Vote/Option.hs @@ -1,21 +1,21 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.EraBased.Options.Governance.Vote +module Cardano.CLI.EraBased.Governance.Vote.Option ( pGovernanceVoteCmds ) where import Cardano.Api -import Cardano.CLI.EraBased.Commands.Governance.Vote +import Cardano.CLI.EraBased.Governance.Vote.Command ( GovernanceVoteCmds (..) , GovernanceVoteCreateCmdArgs (GovernanceVoteCreateCmdArgs) , GovernanceVoteViewCmdArgs (GovernanceVoteViewCmdArgs) ) -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser -import Cardano.CLI.Types.Governance +import Cardano.CLI.Type.Governance import Control.Applicative (optional) import Data.Foldable diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Vote/Run.hs similarity index 92% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Governance/Vote/Run.hs index 9b0c451314..6878926480 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Governance/Vote/Run.hs @@ -6,7 +6,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.EraBased.Run.Governance.Vote +module Cardano.CLI.EraBased.Governance.Vote.Run ( runGovernanceVoteCmds ) where @@ -15,14 +15,14 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Commands.Governance.Vote qualified as Cmd +import Cardano.CLI.EraBased.Governance.Vote.Command qualified as Cmd import Cardano.CLI.EraBased.Script.Vote.Read -import Cardano.CLI.Run.Hash (carryHashChecks) -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.CmdError -import Cardano.CLI.Types.Errors.GovernanceVoteCmdError -import Cardano.CLI.Types.Governance -import Cardano.CLI.Types.Key +import Cardano.CLI.EraIndependent.Hash.Run (carryHashChecks) +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.CmdError +import Cardano.CLI.Type.Error.GovernanceVoteCmdError +import Cardano.CLI.Type.Governance +import Cardano.CLI.Type.Key import Data.Aeson.Encode.Pretty import Data.Function diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Era.hs b/cardano-cli/src/Cardano/CLI/EraBased/Option.hs similarity index 57% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Era.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Option.hs index 3870c9ed3d..f2ce269a83 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Era.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Option.hs @@ -1,20 +1,47 @@ -module Cardano.CLI.EraBased.Options.Era - ( pAnyEraCommand +module Cardano.CLI.EraBased.Option + ( pCmds + , pAnyEraCommand ) where import Cardano.Api (ShelleyBasedEra (..)) import Cardano.CLI.Environment -import Cardano.CLI.EraBased.Commands.TopLevelCommands -import Cardano.CLI.EraBased.Options.Common -import Cardano.CLI.EraBased.Options.TopLevelCommands +import Cardano.CLI.EraBased.Command +import Cardano.CLI.EraBased.Common.Option +import Cardano.CLI.EraBased.Genesis.Option +import Cardano.CLI.EraBased.Governance.Option (pGovernanceCmds) +import Cardano.CLI.EraBased.Query.Option +import Cardano.CLI.EraBased.StakeAddress.Option +import Cardano.CLI.EraBased.StakePool.Option +import Cardano.CLI.EraBased.TextView.Option +import Cardano.CLI.EraBased.Transaction.Option +import Cardano.CLI.EraIndependent.Address.Option +import Cardano.CLI.EraIndependent.Key.Option +import Cardano.CLI.EraIndependent.Node.Option import Cardano.CLI.Parser import Data.Foldable +import Data.Maybe import Options.Applicative (Parser) import Options.Applicative qualified as Opt +pCmds :: ShelleyBasedEra era -> EnvCli -> Parser (Cmds era) +pCmds era envCli = do + asum $ + catMaybes + [ Just (AddressCmds <$> pAddressCmds envCli) + , Just (KeyCmds <$> pKeyCmds) + , fmap GenesisCmds <$> pGenesisCmds era envCli + , fmap GovernanceCmds <$> pGovernanceCmds era + , Just (NodeCmds <$> pNodeCmds) + , fmap QueryCmds <$> pQueryCmds era envCli + , fmap StakeAddressCmds <$> pStakeAddressCmds era envCli + , fmap StakePoolCmds <$> pStakePoolCmds era envCli + , fmap TextViewCmds <$> pTextViewCmds + , fmap TransactionCmds <$> pTransactionCmds era envCli + ] + pAnyEraCommand :: EnvCli -> Parser AnyEraCommand pAnyEraCommand envCli = asum diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/TopLevelCommands.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/TopLevelCommands.hs deleted file mode 100644 index ee1d35e983..0000000000 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/TopLevelCommands.hs +++ /dev/null @@ -1,39 +0,0 @@ -module Cardano.CLI.EraBased.Options.TopLevelCommands - ( pCmds - ) -where - -import Cardano.Api (ShelleyBasedEra (..)) - -import Cardano.CLI.Environment -import Cardano.CLI.EraBased.Commands.TopLevelCommands -import Cardano.CLI.EraBased.Options.Genesis -import Cardano.CLI.EraBased.Options.Governance (pGovernanceCmds) -import Cardano.CLI.EraBased.Options.Query -import Cardano.CLI.EraBased.Options.StakeAddress -import Cardano.CLI.EraBased.Options.StakePool -import Cardano.CLI.EraBased.Options.TextView -import Cardano.CLI.EraBased.Options.Transaction -import Cardano.CLI.Options.Address -import Cardano.CLI.Options.Key -import Cardano.CLI.Options.Node - -import Data.Foldable -import Data.Maybe -import Options.Applicative (Parser) - -pCmds :: ShelleyBasedEra era -> EnvCli -> Parser (Cmds era) -pCmds era envCli = do - asum $ - catMaybes - [ Just (AddressCmds <$> pAddressCmds envCli) - , Just (KeyCmds <$> pKeyCmds) - , fmap GenesisCmds <$> pGenesisCmds era envCli - , fmap GovernanceCmds <$> pGovernanceCmds era - , Just (NodeCmds <$> pNodeCmds) - , fmap QueryCmds <$> pQueryCmds era envCli - , fmap StakeAddressCmds <$> pStakeAddressCmds era envCli - , fmap StakePoolCmds <$> pStakePoolCmds era envCli - , fmap TextViewCmds <$> pTextViewCmds - , fmap TransactionCmds <$> pTransactionCmds era envCli - ] diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Query/Command.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Query/Command.hs index ab6ff2fe4d..1421544a49 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Query/Command.hs @@ -3,7 +3,7 @@ {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.Query +module Cardano.CLI.EraBased.Query.Command ( QueryCmds (..) , QueryCommons (..) , QueryCommitteeMembersStateCmdArgs (..) @@ -38,9 +38,9 @@ import Cardano.Api.Ledger qualified as L import Cardano.Api.Network qualified as Consensus import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) -import Cardano.CLI.Orphans () -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Key +import Cardano.CLI.Orphan () +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Key import Data.Set (Set) import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Query/Option.hs similarity index 99% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Query/Option.hs index d32b91af27..5bb56c3ad5 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Query/Option.hs @@ -3,7 +3,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.EraBased.Options.Query +module Cardano.CLI.EraBased.Query.Option ( pQueryCmds , pQueryCmdsTopLevel ) @@ -14,11 +14,11 @@ import Cardano.Api qualified as MemberStatus (MemberStatus (..)) import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) import Cardano.CLI.Environment (EnvCli (..)) -import Cardano.CLI.EraBased.Commands.Query -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.Query.Command +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Key import Data.Foldable import GHC.Exts (IsList (..)) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Query/Run.hs similarity index 99% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Query/Run.hs index cbc38a63ba..9b1af6614a 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Query/Run.hs @@ -13,7 +13,7 @@ {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeOperators #-} -module Cardano.CLI.EraBased.Run.Query +module Cardano.CLI.EraBased.Query.Run ( runQueryCmds , runQueryKesPeriodInfoCmd , runQueryLeadershipScheduleCmd @@ -48,15 +48,15 @@ import Cardano.Api.Network qualified as Consensus import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) import Cardano.Binary qualified as CBOR -import Cardano.CLI.EraBased.Commands.Query qualified as Cmd -import Cardano.CLI.EraBased.Run.Genesis.Common -import Cardano.CLI.Helpers -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.NodeEraMismatchError -import Cardano.CLI.Types.Errors.QueryCmdError -import Cardano.CLI.Types.Key -import Cardano.CLI.Types.Output (QueryDRepStateOutput (..)) -import Cardano.CLI.Types.Output qualified as O +import Cardano.CLI.EraBased.Query.Command qualified as Cmd +import Cardano.CLI.EraBased.Genesis.Internal.Common +import Cardano.CLI.Helper +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.NodeEraMismatchError +import Cardano.CLI.Type.Error.QueryCmdError +import Cardano.CLI.Type.Key +import Cardano.CLI.Type.Output (QueryDRepStateOutput (..)) +import Cardano.CLI.Type.Output qualified as O import Cardano.Crypto.Hash (hashToBytesAsHex) import Cardano.Crypto.Hash.Blake2b qualified as Blake2b import Cardano.Slotting.EpochInfo (EpochInfo (..), epochInfoSlotToUTCTime, hoistEpochInfo) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run.hs index 2d96171055..4a82cad798 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run.hs @@ -10,19 +10,19 @@ where import Cardano.Api -import Cardano.CLI.EraBased.Commands.TopLevelCommands -import Cardano.CLI.EraBased.Run.Genesis -import Cardano.CLI.EraBased.Run.Governance -import Cardano.CLI.EraBased.Run.Query -import Cardano.CLI.EraBased.Run.StakeAddress -import Cardano.CLI.EraBased.Run.StakePool -import Cardano.CLI.EraBased.Run.TextView -import Cardano.CLI.EraBased.Run.Transaction -import Cardano.CLI.Helpers (printEraDeprecationWarning) -import Cardano.CLI.Run.Address -import Cardano.CLI.Run.Key -import Cardano.CLI.Run.Node -import Cardano.CLI.Types.Errors.CmdError +import Cardano.CLI.EraBased.Command +import Cardano.CLI.EraBased.Genesis.Run +import Cardano.CLI.EraBased.Governance.Run +import Cardano.CLI.EraBased.Query.Run +import Cardano.CLI.EraBased.StakeAddress.Run +import Cardano.CLI.EraBased.StakePool.Run +import Cardano.CLI.EraBased.TextView.Run +import Cardano.CLI.EraBased.Transaction.Run +import Cardano.CLI.EraIndependent.Address.Run +import Cardano.CLI.EraIndependent.Key.Run +import Cardano.CLI.EraIndependent.Node.Run +import Cardano.CLI.Helper (printEraDeprecationWarning) +import Cardano.CLI.Type.Error.CmdError import Data.Function ((&)) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs index fd868fce20..4f4d840348 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs @@ -12,10 +12,10 @@ where import Cardano.Api import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Script.Certificate.Types +import Cardano.CLI.EraBased.Script.Certificate.Type import Cardano.CLI.EraBased.Script.Read.Common -import Cardano.CLI.EraBased.Script.Types -import Cardano.CLI.Types.Common (CertificateFile) +import Cardano.CLI.EraBased.Script.Type +import Cardano.CLI.Type.Common (CertificateFile) import Control.Monad diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Type.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Types.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Type.hs index 531df1b595..36c4b85a3f 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Types.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Type.hs @@ -2,7 +2,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.EraBased.Script.Certificate.Types +module Cardano.CLI.EraBased.Script.Certificate.Type ( CertificateScriptWitness (..) , CliCertificateScriptRequirements (..) , PlutusScriptCliArgs (..) @@ -14,7 +14,7 @@ where import Cardano.Api -import Cardano.CLI.Types.Common (ScriptDataOrFile) +import Cardano.CLI.Type.Common (ScriptDataOrFile) newtype CertificateScriptWitness era = CertificateScriptWitness {cswScriptWitness :: ScriptWitness WitCtxStake era} diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Read.hs index e6c8302eeb..2f96fc3d94 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Read.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Read.hs @@ -10,9 +10,9 @@ where import Cardano.Api import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Script.Mint.Types +import Cardano.CLI.EraBased.Script.Mint.Type import Cardano.CLI.EraBased.Script.Read.Common -import Cardano.CLI.EraBased.Script.Types +import Cardano.CLI.EraBased.Script.Type readMintScriptWitness :: MonadIOTransError (FileError CliScriptWitnessError) t m diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Type.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Types.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Type.hs index 6a2ec8d2f8..e7044db077 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Types.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Type.hs @@ -2,7 +2,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.EraBased.Script.Mint.Types +module Cardano.CLI.EraBased.Script.Mint.Type ( CliMintScriptRequirements (..) , SimpleOrPlutusScriptCliArgs (..) , createSimpleOrPlutusScriptFromCliArgs @@ -16,7 +16,7 @@ where import Cardano.Api -import Cardano.CLI.Types.Common (ScriptDataOrFile) +import Cardano.CLI.Type.Common (ScriptDataOrFile) -- We always need the policy id when constructing a transaction that mints. -- In the case of reference scripts, the user currently must provide the policy id (script hash) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Read.hs index c1b53fada4..d5f20f04b9 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Read.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Read.hs @@ -10,10 +10,10 @@ where import Cardano.Api import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Script.Proposal.Types +import Cardano.CLI.EraBased.Script.Proposal.Type import Cardano.CLI.EraBased.Script.Read.Common -import Cardano.CLI.EraBased.Script.Types -import Cardano.CLI.Types.Common +import Cardano.CLI.EraBased.Script.Type +import Cardano.CLI.Type.Common readProposalScriptWitness :: MonadIOTransError (FileError CliScriptWitnessError) t m diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Type.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Types.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Type.hs index 81d57c1289..2ab8e075b2 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Types.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Type.hs @@ -2,7 +2,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.EraBased.Script.Proposal.Types +module Cardano.CLI.EraBased.Script.Proposal.Type ( CliProposalScriptRequirements (..) , PlutusRefScriptCliArgs (..) , PlutusScriptCliArgs (..) @@ -14,7 +14,7 @@ where import Cardano.Api -import Cardano.CLI.Types.Common (ScriptDataOrFile) +import Cardano.CLI.Type.Common (ScriptDataOrFile) newtype ProposalScriptWitness era = ProposalScriptWitness {pswScriptWitness :: ScriptWitness WitCtxStake era} diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs index 52c4b49909..97ab28be6e 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs @@ -15,11 +15,11 @@ where import Cardano.Api as Api -import Cardano.CLI.EraBased.Script.Types -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.PlutusScriptDecodeError -import Cardano.CLI.Types.Errors.ScriptDataError -import Cardano.CLI.Types.Errors.ScriptDecodeError +import Cardano.CLI.EraBased.Script.Type +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.PlutusScriptDecodeError +import Cardano.CLI.Type.Error.ScriptDataError +import Cardano.CLI.Type.Error.ScriptDecodeError import Prelude diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Read.hs index f0d103f9a4..15a3beb9f0 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Read.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Read.hs @@ -15,8 +15,8 @@ import Cardano.Api import Cardano.Api.Shelley import Cardano.CLI.EraBased.Script.Read.Common -import Cardano.CLI.EraBased.Script.Spend.Types -import Cardano.CLI.EraBased.Script.Types +import Cardano.CLI.EraBased.Script.Spend.Type +import Cardano.CLI.EraBased.Script.Type import Cardano.CLI.Read import Control.Monad diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Type.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Types.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Type.hs index c7102c18b3..392484201c 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Types.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Type.hs @@ -2,7 +2,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.EraBased.Script.Spend.Types +module Cardano.CLI.EraBased.Script.Spend.Type ( CliSpendScriptRequirements (..) , PlutusRefScriptCliArgs (..) , SimpleOrPlutusScriptCliArgs (..) @@ -17,7 +17,7 @@ where import Cardano.Api -import Cardano.CLI.Types.Common (ScriptDataOrFile) +import Cardano.CLI.Type.Common (ScriptDataOrFile) newtype SpendScriptWitness era = SpendScriptWitness {sswScriptWitness :: ScriptWitness WitCtxTxIn era} diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Type.hs similarity index 85% rename from cardano-cli/src/Cardano/CLI/EraBased/Script/Types.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Script/Type.hs index abfad35e1d..83b1df3ba6 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Types.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Type.hs @@ -1,7 +1,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Script.Types +module Cardano.CLI.EraBased.Script.Type ( AnyPlutusScript (..) -- * Errors @@ -11,9 +11,9 @@ where import Cardano.Api -import Cardano.CLI.Types.Errors.PlutusScriptDecodeError -import Cardano.CLI.Types.Errors.ScriptDataError -import Cardano.CLI.Types.Errors.ScriptDecodeError +import Cardano.CLI.Type.Error.PlutusScriptDecodeError +import Cardano.CLI.Type.Error.ScriptDataError +import Cardano.CLI.Type.Error.ScriptDecodeError -- TODO: Move to cardano-api data AnyPlutusScript where diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Read.hs index a493be0482..8a387840c5 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Read.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Read.hs @@ -11,9 +11,9 @@ import Cardano.Api import Cardano.Api.Shelley import Cardano.CLI.EraBased.Script.Read.Common -import Cardano.CLI.EraBased.Script.Types -import Cardano.CLI.EraBased.Script.Vote.Types -import Cardano.CLI.Types.Governance +import Cardano.CLI.EraBased.Script.Type +import Cardano.CLI.EraBased.Script.Vote.Type +import Cardano.CLI.Type.Governance readVoteScriptWitness :: MonadIOTransError (FileError CliScriptWitnessError) t m diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Type.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Types.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Type.hs index 3cd41187ea..1ab70fee05 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Types.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Type.hs @@ -2,7 +2,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.EraBased.Script.Vote.Types +module Cardano.CLI.EraBased.Script.Vote.Type ( CliVoteScriptRequirements (..) , PlutusRefScriptCliArgs (..) , PlutusScriptCliArgs (..) @@ -14,7 +14,7 @@ where import Cardano.Api -import Cardano.CLI.Types.Common (ScriptDataOrFile) +import Cardano.CLI.Type.Common (ScriptDataOrFile) newtype VoteScriptWitness era = VoteScriptWitness {vswScriptWitness :: ScriptWitness WitCtxStake era} diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs index 0f25d48eb3..88f465a731 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs @@ -12,8 +12,8 @@ import Cardano.Api.Ledger import Cardano.Api.Shelley import Cardano.CLI.EraBased.Script.Read.Common -import Cardano.CLI.EraBased.Script.Types -import Cardano.CLI.EraBased.Script.Withdrawal.Types +import Cardano.CLI.EraBased.Script.Type +import Cardano.CLI.EraBased.Script.Withdrawal.Type readWithdrawalScriptWitness :: MonadIOTransError (FileError CliScriptWitnessError) t m diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Type.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Types.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Type.hs index 2c851975cd..747f0739e4 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Types.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Type.hs @@ -2,7 +2,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.EraBased.Script.Withdrawal.Types +module Cardano.CLI.EraBased.Script.Withdrawal.Type ( CliWithdrawalScriptRequirements (..) , PlutusRefScriptCliArgs (..) , PlutusScriptCliArgs (..) @@ -14,7 +14,7 @@ where import Cardano.Api -import Cardano.CLI.Types.Common (ScriptDataOrFile) +import Cardano.CLI.Type.Common (ScriptDataOrFile) newtype WithdrawalScriptWitness era = WithdrawalScriptWitness {wswScriptWitness :: ScriptWitness WitCtxStake era} diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/EraBased/StakeAddress/Command.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/StakeAddress.hs rename to cardano-cli/src/Cardano/CLI/EraBased/StakeAddress/Command.hs index 76a3a875a3..3d77828bfd 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakeAddress.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/StakeAddress/Command.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.StakeAddress +module Cardano.CLI.EraBased.StakeAddress.Command ( StakeAddressCmds (..) , renderStakeAddressCmds ) @@ -10,9 +10,9 @@ where import Cardano.Api.Ledger (Coin) import Cardano.Api.Shelley -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Governance -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Governance +import Cardano.CLI.Type.Key import Prelude diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/EraBased/StakeAddress/Option.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs rename to cardano-cli/src/Cardano/CLI/EraBased/StakeAddress/Option.hs index 4d57c1fdb6..7820c3de66 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/StakeAddress/Option.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.EraBased.Options.StakeAddress +module Cardano.CLI.EraBased.StakeAddress.Option ( pStakeAddressCmds ) where @@ -9,8 +9,8 @@ where import Cardano.Api import Cardano.CLI.Environment -import Cardano.CLI.EraBased.Commands.StakeAddress -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.StakeAddress.Command +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser import Options.Applicative diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/EraBased/StakeAddress/Run.hs similarity index 97% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/StakeAddress.hs rename to cardano-cli/src/Cardano/CLI/EraBased/StakeAddress/Run.hs index 9702737fd9..c508e4ac1b 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/StakeAddress.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/StakeAddress/Run.hs @@ -7,7 +7,7 @@ {- HLINT ignore "Monad law, left identity" -} -module Cardano.CLI.EraBased.Run.StakeAddress +module Cardano.CLI.EraBased.StakeAddress.Run ( runStakeAddressCmds , runStakeAddressBuildCmd , runStakeAddressKeyGenCmd @@ -24,14 +24,14 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Commands.StakeAddress +import Cardano.CLI.EraBased.StakeAddress.Command import Cardano.CLI.Read -import Cardano.CLI.Run.Key qualified as Key -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.StakeAddressCmdError -import Cardano.CLI.Types.Errors.StakeAddressRegistrationError -import Cardano.CLI.Types.Governance -import Cardano.CLI.Types.Key +import Cardano.CLI.EraIndependent.Key.Run qualified as Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.StakeAddressCmdError +import Cardano.CLI.Type.Error.StakeAddressRegistrationError +import Cardano.CLI.Type.Governance +import Cardano.CLI.Type.Key import Control.Monad (void) import Data.ByteString.Char8 qualified as BS diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakePool.hs b/cardano-cli/src/Cardano/CLI/EraBased/StakePool/Command.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/StakePool.hs rename to cardano-cli/src/Cardano/CLI/EraBased/StakePool/Command.hs index f6f0fc1cf4..323bb472bd 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakePool.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/StakePool/Command.hs @@ -2,7 +2,7 @@ {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.StakePool +module Cardano.CLI.EraBased.StakePool.Command ( StakePoolCmds (..) , renderStakePoolCmds , StakePoolDeregistrationCertificateCmdArgs (..) @@ -17,9 +17,9 @@ import Cardano.Api.Ledger (Coin) import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) -import Cardano.CLI.Commands.Hash (HashGoal) -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Key +import Cardano.CLI.EraIndependent.Hash.Command (HashGoal) +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Key import Prelude diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs b/cardano-cli/src/Cardano/CLI/EraBased/StakePool/Option.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs rename to cardano-cli/src/Cardano/CLI/EraBased/StakePool/Option.hs index 55b3e4fbdb..c004b2a246 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/StakePool/Option.hs @@ -6,7 +6,7 @@ {- HLINT ignore "Use <$>" -} {- HLINT ignore "Move brackets to avoid $" -} -module Cardano.CLI.EraBased.Options.StakePool +module Cardano.CLI.EraBased.StakePool.Option ( pStakePoolCmds ) where @@ -15,10 +15,10 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley (Hash (StakePoolMetadataHash)) -import Cardano.CLI.Commands.Hash qualified as Cmd +import Cardano.CLI.EraIndependent.Hash.Command qualified as Cmd import Cardano.CLI.Environment (EnvCli (..)) -import Cardano.CLI.EraBased.Commands.StakePool qualified as Cmd -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.StakePool.Command qualified as Cmd +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser import Data.Foldable qualified as F diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/StakePool.hs b/cardano-cli/src/Cardano/CLI/EraBased/StakePool/Run.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/StakePool.hs rename to cardano-cli/src/Cardano/CLI/EraBased/StakePool/Run.hs index e74c2e581c..50dca2c49a 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/StakePool.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/StakePool/Run.hs @@ -5,7 +5,7 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RankNTypes #-} -module Cardano.CLI.EraBased.Run.StakePool +module Cardano.CLI.EraBased.StakePool.Run ( runStakePoolCmds , runStakePoolIdCmd , runStakePoolMetadataHashCmd @@ -17,14 +17,14 @@ where import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.Commands.Hash qualified as Cmd -import Cardano.CLI.EraBased.Commands.StakePool -import Cardano.CLI.EraBased.Commands.StakePool qualified as Cmd -import Cardano.CLI.Run.Hash (allSchemes, getByteStringFromURL, httpsAndIpfsSchemes) -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError (..)) -import Cardano.CLI.Types.Errors.StakePoolCmdError -import Cardano.CLI.Types.Key (readVerificationKeyOrFile) +import Cardano.CLI.EraIndependent.Hash.Command qualified as Cmd +import Cardano.CLI.EraBased.StakePool.Command +import Cardano.CLI.EraBased.StakePool.Command qualified as Cmd +import Cardano.CLI.EraIndependent.Hash.Run (allSchemes, getByteStringFromURL, httpsAndIpfsSchemes) +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.HashCmdError (FetchURLError (..)) +import Cardano.CLI.Type.Error.StakePoolCmdError +import Cardano.CLI.Type.Key (readVerificationKeyOrFile) import Control.Monad (when) import Data.ByteString.Char8 qualified as BS diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/TextView.hs b/cardano-cli/src/Cardano/CLI/EraBased/TextView/Command.hs similarity index 89% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/TextView.hs rename to cardano-cli/src/Cardano/CLI/EraBased/TextView/Command.hs index b2ed123869..63777e0f2f 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/TextView.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/TextView/Command.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.TextView +module Cardano.CLI.EraBased.TextView.Command ( TextViewCmds (..) , renderTextViewCmds ) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/TextView.hs b/cardano-cli/src/Cardano/CLI/EraBased/TextView/Option.hs similarity index 86% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/TextView.hs rename to cardano-cli/src/Cardano/CLI/EraBased/TextView/Option.hs index 5f90341853..cc9359a31a 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/TextView.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/TextView/Option.hs @@ -3,13 +3,13 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.EraBased.Options.TextView +module Cardano.CLI.EraBased.TextView.Option ( pTextViewCmds ) where -import Cardano.CLI.EraBased.Commands.TextView -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.TextView.Command +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser import Options.Applicative hiding (help, str) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/TextView.hs b/cardano-cli/src/Cardano/CLI/EraBased/TextView/Run.hs similarity index 81% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/TextView.hs rename to cardano-cli/src/Cardano/CLI/EraBased/TextView/Run.hs index d7899526ee..865152dec1 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/TextView.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/TextView/Run.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Run.TextView +module Cardano.CLI.EraBased.TextView.Run ( runTextViewCmds , runTextViewInfoCmd ) @@ -9,9 +9,9 @@ where import Cardano.Api -import Cardano.CLI.EraBased.Commands.TextView -import Cardano.CLI.Helpers (pPrintCBOR) -import Cardano.CLI.Types.Errors.TextViewFileError +import Cardano.CLI.EraBased.TextView.Command +import Cardano.CLI.Helper (pPrintCBOR) +import Cardano.CLI.Type.Error.TextViewFileError import Data.ByteString.Lazy.Char8 qualified as LBS diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Transaction/Command.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Transaction/Command.hs index 5672312470..22db552d76 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Transaction/Command.hs @@ -2,7 +2,7 @@ {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.EraBased.Commands.Transaction +module Cardano.CLI.EraBased.Transaction.Command ( TransactionCmds (..) , TransactionBuildRawCmdArgs (..) , TransactionBuildCmdArgs (..) @@ -26,15 +26,15 @@ import Cardano.Api.Experimental qualified as Exp import Cardano.Api.Ledger (Coin) import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Script.Certificate.Types (CliCertificateScriptRequirements) -import Cardano.CLI.EraBased.Script.Mint.Types -import Cardano.CLI.EraBased.Script.Proposal.Types (CliProposalScriptRequirements) -import Cardano.CLI.EraBased.Script.Spend.Types (CliSpendScriptRequirements) -import Cardano.CLI.EraBased.Script.Vote.Types -import Cardano.CLI.EraBased.Script.Withdrawal.Types -import Cardano.CLI.Orphans () -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Governance +import Cardano.CLI.EraBased.Script.Certificate.Type (CliCertificateScriptRequirements) +import Cardano.CLI.EraBased.Script.Mint.Type +import Cardano.CLI.EraBased.Script.Proposal.Type (CliProposalScriptRequirements) +import Cardano.CLI.EraBased.Script.Spend.Type (CliSpendScriptRequirements) +import Cardano.CLI.EraBased.Script.Vote.Type +import Cardano.CLI.EraBased.Script.Withdrawal.Type +import Cardano.CLI.Orphan () +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Governance import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Transaction/HashCheck.hs b/cardano-cli/src/Cardano/CLI/EraBased/Transaction/Internal/HashCheck.hs similarity index 90% rename from cardano-cli/src/Cardano/CLI/EraBased/Transaction/HashCheck.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Transaction/Internal/HashCheck.hs index 5ce9508ea5..13a0ee7c40 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Transaction/HashCheck.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Transaction/Internal/HashCheck.hs @@ -1,6 +1,6 @@ {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.EraBased.Transaction.HashCheck +module Cardano.CLI.EraBased.Transaction.Internal.HashCheck ( checkCertificateHashes , checkVotingProcedureHashes , checkProposalHashes @@ -19,9 +19,9 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley qualified as Shelley -import Cardano.CLI.Run.Hash (carryHashChecks) -import Cardano.CLI.Types.Common (MustCheckHash (..), PotentiallyCheckedAnchor (..)) -import Cardano.CLI.Types.Errors.TxCmdError (TxCmdError (..)) +import Cardano.CLI.EraIndependent.Hash.Run (carryHashChecks) +import Cardano.CLI.Type.Common (MustCheckHash (..), PotentiallyCheckedAnchor (..)) +import Cardano.CLI.Type.Error.TxCmdError (TxCmdError (..)) import Control.Monad (forM_) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Transaction/Option.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Transaction/Option.hs index 6e36d47217..a978fbb36a 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Transaction/Option.hs @@ -4,7 +4,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} -module Cardano.CLI.EraBased.Options.Transaction +module Cardano.CLI.EraBased.Transaction.Option ( pTransactionCmds ) where @@ -13,10 +13,10 @@ import Cardano.Api hiding (QueryInShelleyBasedEra (..)) import Cardano.Api.Experimental qualified as Exp import Cardano.CLI.Environment (EnvCli (..)) -import Cardano.CLI.EraBased.Commands.Transaction -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.Transaction.Command +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Foldable import Options.Applicative hiding (help, str) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs rename to cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs index d04fd4848e..ce1fedf3fa 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs @@ -17,7 +17,7 @@ {- HLINT ignore "Unused LANGUAGE pragma" -} {- HLINT ignore "Avoid lambda using `infix`" -} -module Cardano.CLI.EraBased.Run.Transaction +module Cardano.CLI.EraBased.Transaction.Run ( mkShelleyBootstrapWitnesses , partitionSomeWitnesses , runTransactionCmds @@ -47,35 +47,35 @@ import Cardano.Api.Network qualified as Net.Tx import Cardano.Api.Shelley import Cardano.Binary qualified as CBOR -import Cardano.CLI.EraBased.Commands.Transaction -import Cardano.CLI.EraBased.Commands.Transaction qualified as Cmd -import Cardano.CLI.EraBased.Run.Genesis.Common (readProtocolParameters) -import Cardano.CLI.EraBased.Run.Query +import Cardano.CLI.EraBased.Transaction.Command +import Cardano.CLI.EraBased.Transaction.Command qualified as Cmd +import Cardano.CLI.EraBased.Genesis.Internal.Common (readProtocolParameters) +import Cardano.CLI.EraBased.Query.Run import Cardano.CLI.EraBased.Script.Certificate.Read -import Cardano.CLI.EraBased.Script.Certificate.Types (CertificateScriptWitness (..)) +import Cardano.CLI.EraBased.Script.Certificate.Type (CertificateScriptWitness (..)) import Cardano.CLI.EraBased.Script.Mint.Read -import Cardano.CLI.EraBased.Script.Mint.Types -import Cardano.CLI.EraBased.Script.Proposal.Types (ProposalScriptWitness (..)) +import Cardano.CLI.EraBased.Script.Mint.Type +import Cardano.CLI.EraBased.Script.Proposal.Type (ProposalScriptWitness (..)) import Cardano.CLI.EraBased.Script.Read.Common import Cardano.CLI.EraBased.Script.Spend.Read -import Cardano.CLI.EraBased.Script.Spend.Types (SpendScriptWitness (..)) -import Cardano.CLI.EraBased.Script.Vote.Types +import Cardano.CLI.EraBased.Script.Spend.Type (SpendScriptWitness (..)) +import Cardano.CLI.EraBased.Script.Vote.Type import Cardano.CLI.EraBased.Script.Withdrawal.Read -import Cardano.CLI.EraBased.Script.Withdrawal.Types (WithdrawalScriptWitness (..)) -import Cardano.CLI.EraBased.Transaction.HashCheck +import Cardano.CLI.EraBased.Script.Withdrawal.Type (WithdrawalScriptWitness (..)) +import Cardano.CLI.EraBased.Transaction.Internal.HashCheck ( checkCertificateHashes , checkProposalHashes , checkVotingProcedureHashes ) -import Cardano.CLI.Orphans () +import Cardano.CLI.Orphan () import Cardano.CLI.Read -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.BootstrapWitnessError -import Cardano.CLI.Types.Errors.NodeEraMismatchError -import Cardano.CLI.Types.Errors.TxCmdError -import Cardano.CLI.Types.Errors.TxValidationError -import Cardano.CLI.Types.Output (renderScriptCostsWithScriptHashesMap) -import Cardano.CLI.Types.TxFeature +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.BootstrapWitnessError +import Cardano.CLI.Type.Error.NodeEraMismatchError +import Cardano.CLI.Type.Error.TxCmdError +import Cardano.CLI.Type.Error.TxValidationError +import Cardano.CLI.Type.Output (renderScriptCostsWithScriptHashesMap) +import Cardano.CLI.Type.TxFeature import Cardano.Ledger.Api (allInputsTxBodyF, bodyTxL) import Cardano.Prelude (putLByteString) diff --git a/cardano-cli/src/Cardano/CLI/Commands/Address.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Address/Command.hs similarity index 88% rename from cardano-cli/src/Cardano/CLI/Commands/Address.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Address/Command.hs index ce21dec774..72facb1cd4 100644 --- a/cardano-cli/src/Cardano/CLI/Commands/Address.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Address/Command.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Commands.Address +module Cardano.CLI.EraIndependent.Address.Command ( AddressCmds (..) , renderAddressCmds ) @@ -9,8 +9,8 @@ where import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Key import Prelude diff --git a/cardano-cli/src/Cardano/CLI/Run/Address/Info.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Address/Info/Run.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/Run/Address/Info.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Address/Info/Run.hs index a4bc14b82f..f907108378 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Address/Info.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Address/Info/Run.hs @@ -1,14 +1,14 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.Run.Address.Info +module Cardano.CLI.EraIndependent.Address.Info.Run ( runAddressInfoCmd ) where import Cardano.Api -import Cardano.CLI.Types.Errors.AddressInfoError +import Cardano.CLI.Type.Error.AddressInfoError import Data.Aeson (ToJSON (..), object, (.=)) import Data.Aeson.Encode.Pretty (encodePretty) diff --git a/cardano-cli/src/Cardano/CLI/Options/Address.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Address/Option.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/Options/Address.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Address/Option.hs index 7fbcc0fb9b..8301072f1e 100644 --- a/cardano-cli/src/Cardano/CLI/Options/Address.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Address/Option.hs @@ -3,14 +3,14 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Options.Address +module Cardano.CLI.EraIndependent.Address.Option ( pAddressCmds ) where -import Cardano.CLI.Commands.Address +import Cardano.CLI.EraIndependent.Address.Command import Cardano.CLI.Environment (EnvCli (..)) -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser import Data.Foldable diff --git a/cardano-cli/src/Cardano/CLI/Run/Address.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Address/Run.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/Run/Address.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Address/Run.hs index 2c72d5a038..0418996823 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Address.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Address/Run.hs @@ -5,7 +5,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Run.Address +module Cardano.CLI.EraIndependent.Address.Run ( runAddressCmds , runAddressBuildCmd , runAddressKeyGenCmd @@ -18,13 +18,13 @@ where import Cardano.Api import Cardano.Api.Shelley -import Cardano.CLI.Commands.Address +import Cardano.CLI.EraIndependent.Address.Command import Cardano.CLI.Read -import Cardano.CLI.Run.Address.Info -import Cardano.CLI.Run.Key qualified as Key -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.AddressCmdError -import Cardano.CLI.Types.Key +import Cardano.CLI.EraIndependent.Address.Info.Run +import Cardano.CLI.EraIndependent.Key.Run qualified as Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.AddressCmdError +import Cardano.CLI.Type.Key ( PaymentVerifier (..) , StakeIdentifier (..) , StakeVerifier (..) diff --git a/cardano-cli/src/Cardano/CLI/Commands/Debug/CheckNodeConfiguration.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/CheckNodeConfiguration/Command.hs similarity index 72% rename from cardano-cli/src/Cardano/CLI/Commands/Debug/CheckNodeConfiguration.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Debug/CheckNodeConfiguration/Command.hs index d74dc623b1..9c42cb3edb 100644 --- a/cardano-cli/src/Cardano/CLI/Commands/Debug/CheckNodeConfiguration.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/CheckNodeConfiguration/Command.hs @@ -1,6 +1,6 @@ {-# LANGUAGE DataKinds #-} -module Cardano.CLI.Commands.Debug.CheckNodeConfiguration where +module Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Command where import Cardano.Api diff --git a/cardano-cli/src/Cardano/CLI/Run/Debug/CheckNodeConfiguration.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/CheckNodeConfiguration/Run.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/Run/Debug/CheckNodeConfiguration.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Debug/CheckNodeConfiguration/Run.hs index 901a246683..05a0b2c16e 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Debug/CheckNodeConfiguration.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/CheckNodeConfiguration/Run.hs @@ -1,14 +1,14 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Run.Debug.CheckNodeConfiguration (runCheckNodeConfig) where +module Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Run (runCheckNodeConfig) where import Cardano.Api import Cardano.Api.Byron qualified as Byron -import Cardano.CLI.Commands.Debug.CheckNodeConfiguration +import Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Command import Cardano.CLI.Read qualified as Read -import Cardano.CLI.Types.Errors.DebugCmdError +import Cardano.CLI.Type.Error.DebugCmdError import Cardano.Crypto.Hash qualified as Crypto import Control.Monad diff --git a/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/Command.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/Command.hs new file mode 100644 index 0000000000..9ae119f3d7 --- /dev/null +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/Command.hs @@ -0,0 +1,13 @@ +module Cardano.CLI.EraIndependent.Debug.Command + ( DebugCmds (..) + ) +where + +import Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Command +import Cardano.CLI.EraIndependent.Debug.LogEpochState.Command +import Cardano.CLI.EraIndependent.Debug.TransactionView.Command + +data DebugCmds + = DebugCheckNodeConfigurationCmd CheckNodeConfigCmdArgs + | DebugLogEpochStateCmd LogEpochStateCmdArgs + | DebugTransactionViewCmd TransactionViewCmdArgs diff --git a/cardano-cli/src/Cardano/CLI/Commands/Debug/LogEpochState.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/LogEpochState/Command.hs similarity index 85% rename from cardano-cli/src/Cardano/CLI/Commands/Debug/LogEpochState.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Debug/LogEpochState/Command.hs index 30ad067c95..ab8a41d5f8 100644 --- a/cardano-cli/src/Cardano/CLI/Commands/Debug/LogEpochState.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/LogEpochState/Command.hs @@ -1,6 +1,6 @@ {-# LANGUAGE DataKinds #-} -module Cardano.CLI.Commands.Debug.LogEpochState +module Cardano.CLI.EraIndependent.Debug.LogEpochState.Command ( LogEpochStateCmdArgs (..) , Configuration ) @@ -8,7 +8,7 @@ where import Cardano.Api -import Cardano.CLI.Orphans () +import Cardano.CLI.Orphan () -- | A phantom type to represent the configuration file. data Configuration diff --git a/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/LogEpochState/Run.hs similarity index 87% rename from cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Debug/LogEpochState/Run.hs index 759b5941af..b7a1ed7247 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/LogEpochState/Run.hs @@ -2,7 +2,7 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Run.Debug.LogEpochState +module Cardano.CLI.EraIndependent.Debug.LogEpochState.Run ( runLogEpochStateCmd ) where @@ -10,8 +10,8 @@ where import Cardano.Api import Cardano.Api qualified as Api -import Cardano.CLI.Commands.Debug.LogEpochState -import Cardano.CLI.Orphans () +import Cardano.CLI.EraIndependent.Debug.LogEpochState.Command +import Cardano.CLI.Orphan () import Data.Aeson qualified as Aeson import Data.ByteString.Lazy qualified as LBS diff --git a/cardano-cli/src/Cardano/CLI/Options/Debug.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/Option.hs similarity index 88% rename from cardano-cli/src/Cardano/CLI/Options/Debug.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Debug/Option.hs index a0d982e8e9..f16c5b3460 100644 --- a/cardano-cli/src/Cardano/CLI/Options/Debug.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/Option.hs @@ -6,19 +6,19 @@ {- HLINT ignore "Use <$>" -} {- HLINT ignore "Move brackets to avoid $" -} -module Cardano.CLI.Options.Debug +module Cardano.CLI.EraIndependent.Debug.Option ( parseDebugCmds ) where import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) -import Cardano.CLI.Commands.Debug -import Cardano.CLI.Commands.Debug.CheckNodeConfiguration -import Cardano.CLI.Commands.Debug.LogEpochState -import Cardano.CLI.Commands.Debug.TransactionView +import Cardano.CLI.EraIndependent.Debug.Command +import Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Command +import Cardano.CLI.EraIndependent.Debug.LogEpochState.Command +import Cardano.CLI.EraIndependent.Debug.TransactionView.Command import Cardano.CLI.Environment -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser import Data.Foldable diff --git a/cardano-cli/src/Cardano/CLI/Run/Debug.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/Run.hs similarity index 53% rename from cardano-cli/src/Cardano/CLI/Run/Debug.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Debug/Run.hs index ada7022c63..9ef49dd384 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Debug.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/Run.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Run.Debug +module Cardano.CLI.EraIndependent.Debug.Run ( DebugCmdError (..) , runLogEpochStateCmd , runDebugCmds @@ -9,11 +9,11 @@ where import Cardano.Api -import Cardano.CLI.Commands.Debug -import Cardano.CLI.Run.Debug.CheckNodeConfiguration (runCheckNodeConfig) -import Cardano.CLI.Run.Debug.LogEpochState -import Cardano.CLI.Run.Debug.TransactionView (runTransactionViewCmd) -import Cardano.CLI.Types.Errors.DebugCmdError +import Cardano.CLI.EraIndependent.Debug.Command +import Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Run (runCheckNodeConfig) +import Cardano.CLI.EraIndependent.Debug.LogEpochState.Run +import Cardano.CLI.EraIndependent.Debug.TransactionView.Run (runTransactionViewCmd) +import Cardano.CLI.Type.Error.DebugCmdError runDebugCmds :: DebugCmds -> ExceptT DebugCmdError IO () runDebugCmds = \case diff --git a/cardano-cli/src/Cardano/CLI/Commands/Debug/TransactionView.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/TransactionView/Command.hs similarity index 69% rename from cardano-cli/src/Cardano/CLI/Commands/Debug/TransactionView.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Debug/TransactionView/Command.hs index 1faa8988a4..2ed21218b2 100644 --- a/cardano-cli/src/Cardano/CLI/Commands/Debug/TransactionView.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/TransactionView/Command.hs @@ -1,8 +1,8 @@ {-# LANGUAGE DataKinds #-} -module Cardano.CLI.Commands.Debug.TransactionView where +module Cardano.CLI.EraIndependent.Debug.TransactionView.Command where -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common data TransactionViewCmdArgs = TransactionViewCmdArgs { outputFormat :: !ViewOutputFormat diff --git a/cardano-cli/src/Cardano/CLI/Run/Debug/TransactionView.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/TransactionView/Run.hs similarity index 89% rename from cardano-cli/src/Cardano/CLI/Run/Debug/TransactionView.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Debug/TransactionView/Run.hs index dfe2d06d29..6db62b7449 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Debug/TransactionView.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Debug/TransactionView/Run.hs @@ -1,21 +1,21 @@ {-# LANGUAGE NamedFieldPuns #-} -module Cardano.CLI.Run.Debug.TransactionView +module Cardano.CLI.EraIndependent.Debug.TransactionView.Run ( runTransactionViewCmd ) where import Cardano.Api -import Cardano.CLI.Commands.Debug.TransactionView +import Cardano.CLI.EraIndependent.Debug.TransactionView.Command import Cardano.CLI.Json.Friendly ( friendlyTx , friendlyTxBody , viewOutputFormatToFriendlyFormat ) import Cardano.CLI.Read -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.TxCmdError +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.TxCmdError import Data.Function ((&)) diff --git a/cardano-cli/src/Cardano/CLI/Commands/Hash.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Command.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/Commands/Hash.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Command.hs index 4a071162ec..8ec2cf038f 100644 --- a/cardano-cli/src/Cardano/CLI/Commands/Hash.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Command.hs @@ -3,7 +3,7 @@ {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Commands.Hash +module Cardano.CLI.EraIndependent.Hash.Command ( HashCmds (..) , HashGoal (..) , HashAnchorDataCmdArgs (..) @@ -16,7 +16,7 @@ where import Cardano.Api import Cardano.Api.Ledger qualified as L -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/Options/Hash.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Option.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/Options/Hash.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Option.hs index fbca5582b5..e60da59ed6 100644 --- a/cardano-cli/src/Cardano/CLI/Options/Hash.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Option.hs @@ -1,15 +1,15 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.Options.Hash +module Cardano.CLI.EraIndependent.Hash.Option ( pHashCmds ) where import Cardano.Api.Ledger qualified as L -import Cardano.CLI.Commands.Hash qualified as Cmd -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraIndependent.Hash.Command qualified as Cmd +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser import Data.Foldable diff --git a/cardano-cli/src/Cardano/CLI/Run/Hash.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Run.hs similarity index 97% rename from cardano-cli/src/Cardano/CLI/Run/Hash.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Run.hs index 667e1bce62..7f5ca73afa 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Hash.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Run.hs @@ -6,7 +6,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Run.Hash +module Cardano.CLI.EraIndependent.Hash.Run ( runHashCmds , getByteStringFromURL , carryHashChecks @@ -18,17 +18,17 @@ where import Cardano.Api import Cardano.Api.Ledger qualified as L -import Cardano.CLI.Commands.Hash qualified as Cmd +import Cardano.CLI.EraIndependent.Hash.Command qualified as Cmd import Cardano.CLI.Parser (stringToAnchorScheme) import Cardano.CLI.Read -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common ( AnchorScheme (..) , GenesisFile (..) , MustCheckHash (..) , PotentiallyCheckedAnchor (..) , SupportedSchemes ) -import Cardano.CLI.Types.Errors.HashCmdError +import Cardano.CLI.Type.Error.HashCmdError import Cardano.Crypto.Hash (hashToTextAsHex) import Cardano.Crypto.Hash qualified as Crypto import Cardano.Prelude (ByteString, first) diff --git a/cardano-cli/src/Cardano/CLI/Commands/Key.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Key/Command.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/Commands/Key.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Key/Command.hs index 0e76c51e17..20a90eb902 100644 --- a/cardano-cli/src/Cardano/CLI/Commands/Key.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Key/Command.hs @@ -2,7 +2,7 @@ {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Commands.Key +module Cardano.CLI.EraIndependent.Key.Command ( KeyCmds (..) , KeyVerificationKeyCmdArgs (..) , KeyNonExtendedKeyCmdArgs (..) @@ -18,7 +18,7 @@ where import Cardano.Api.Shelley -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/Options/Key.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Key/Option.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/Options/Key.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Key/Option.hs index e61a9d5411..69d46a5f7a 100644 --- a/cardano-cli/src/Cardano/CLI/Options/Key.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Key/Option.hs @@ -3,17 +3,17 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Options.Key +module Cardano.CLI.EraIndependent.Key.Option ( pKeyCmds ) where import Cardano.Api hiding (QueryInShelleyBasedEra (..)) -import Cardano.CLI.Commands.Key -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraIndependent.Key.Command +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Foldable import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/Run/Key.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Key/Run.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/Run/Key.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Key/Run.hs index 25f8e77e15..808c10c983 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Key.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Key/Run.hs @@ -6,7 +6,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Run.Key +module Cardano.CLI.EraIndependent.Key.Run ( runKeyCmds , runConvertByronGenesisVKeyCmd , runConvertByronKeyCmd @@ -38,12 +38,12 @@ import Cardano.Api.Crypto.Ed25519Bip32 (xPrvFromBytes) import Cardano.Api.Ledger qualified as L import Cardano.CLI.Byron.Key qualified as Byron -import Cardano.CLI.Commands.Key qualified as Cmd -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.CardanoAddressSigningKeyConversionError -import Cardano.CLI.Types.Errors.ItnKeyConversionError -import Cardano.CLI.Types.Errors.KeyCmdError -import Cardano.CLI.Types.Key +import Cardano.CLI.EraIndependent.Key.Command qualified as Cmd +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.CardanoAddressSigningKeyConversionError +import Cardano.CLI.Type.Error.ItnKeyConversionError +import Cardano.CLI.Type.Error.KeyCmdError +import Cardano.CLI.Type.Key import Cardano.Crypto.DSIGN qualified as DSIGN import Cardano.Crypto.Signing qualified as Byron import Cardano.Crypto.Signing qualified as Byron.Crypto diff --git a/cardano-cli/src/Cardano/CLI/Commands/Node.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Node/Command.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/Commands/Node.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Node/Command.hs index a66e113588..2d716f1a40 100644 --- a/cardano-cli/src/Cardano/CLI/Commands/Node.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Node/Command.hs @@ -2,7 +2,7 @@ {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Commands.Node +module Cardano.CLI.EraIndependent.Node.Command ( NodeCmds (..) , renderNodeCmds , NodeKeyGenColdCmdArgs (..) @@ -16,8 +16,8 @@ where import Cardano.Api.Shelley -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Key import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/Options/Node.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Node/Option.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/Options/Node.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Node/Option.hs index 11ac5e1d03..10aaec826c 100644 --- a/cardano-cli/src/Cardano/CLI/Options/Node.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Node/Option.hs @@ -3,16 +3,16 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Options.Node +module Cardano.CLI.EraIndependent.Node.Option ( pNodeCmds ) where import Cardano.Api hiding (QueryInShelleyBasedEra (..)) -import Cardano.CLI.Commands.Node -import Cardano.CLI.Commands.Node qualified as Cmd -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraIndependent.Node.Command +import Cardano.CLI.EraIndependent.Node.Command qualified as Cmd +import Cardano.CLI.EraBased.Common.Option import Cardano.CLI.Parser import Data.Foldable diff --git a/cardano-cli/src/Cardano/CLI/Run/Node.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Node/Run.hs similarity index 97% rename from cardano-cli/src/Cardano/CLI/Run/Node.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Node/Run.hs index efa687bde4..5b4fa7ef05 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Node.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Node/Run.hs @@ -3,7 +3,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} -module Cardano.CLI.Run.Node +module Cardano.CLI.EraIndependent.Node.Run ( runNodeCmds , runNodeIssueOpCertCmd , runNodeKeyGenColdCmd @@ -17,10 +17,10 @@ where import Cardano.Api import Cardano.Api.Shelley -import Cardano.CLI.Commands.Node qualified as Cmd -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.NodeCmdError -import Cardano.CLI.Types.Key +import Cardano.CLI.EraIndependent.Node.Command qualified as Cmd +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.NodeCmdError +import Cardano.CLI.Type.Key import Data.ByteString.Char8 qualified as BS import Data.String (fromString) diff --git a/cardano-cli/src/Cardano/CLI/Commands/Ping.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Ping/Command.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/Commands/Ping.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Ping/Command.hs index f0680da349..4d8732f365 100644 --- a/cardano-cli/src/Cardano/CLI/Commands/Ping.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Ping/Command.hs @@ -1,4 +1,4 @@ -module Cardano.CLI.Commands.Ping +module Cardano.CLI.EraIndependent.Ping.Command ( EndPoint (..) , PingCmd (..) , getConfigurationError diff --git a/cardano-cli/src/Cardano/CLI/Options/Ping.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Ping/Option.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/Options/Ping.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Ping/Option.hs index 46f8789333..32da74e3b3 100644 --- a/cardano-cli/src/Cardano/CLI/Options/Ping.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Ping/Option.hs @@ -2,14 +2,14 @@ {- HLINT ignore "Move brackets to avoid $" -} -module Cardano.CLI.Options.Ping +module Cardano.CLI.EraIndependent.Ping.Option ( parsePingCmd ) where -import Cardano.CLI.Commands (ClientCommand (CliPingCommand)) -import Cardano.CLI.Commands.Ping -import Cardano.CLI.EraBased.Options.Common (integralReader) +import Cardano.CLI.Command (ClientCommand (CliPingCommand)) +import Cardano.CLI.EraIndependent.Ping.Command +import Cardano.CLI.EraBased.Common.Option (integralReader) import Cardano.Network.Ping qualified as CNP import Control.Applicative ((<|>)) diff --git a/cardano-cli/src/Cardano/CLI/Run/Ping.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Ping/Run.hs similarity index 97% rename from cardano-cli/src/Cardano/CLI/Run/Ping.hs rename to cardano-cli/src/Cardano/CLI/EraIndependent/Ping/Run.hs index f321b07a2d..d2d3133811 100644 --- a/cardano-cli/src/Cardano/CLI/Run/Ping.hs +++ b/cardano-cli/src/Cardano/CLI/EraIndependent/Ping/Run.hs @@ -2,7 +2,7 @@ {- HLINT ignore "Move brackets to avoid $" -} -module Cardano.CLI.Run.Ping +module Cardano.CLI.EraIndependent.Ping.Run ( PingClientCmdError (..) , renderPingClientCmdError , runPingCmd @@ -11,7 +11,7 @@ where import Cardano.Api -import Cardano.CLI.Commands.Ping +import Cardano.CLI.EraIndependent.Ping.Command import Cardano.Network.Ping qualified as CNP import Control.Concurrent.Class.MonadSTM.Strict (StrictTMVar) diff --git a/cardano-cli/src/Cardano/CLI/Helpers.hs b/cardano-cli/src/Cardano/CLI/Helper.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/Helpers.hs rename to cardano-cli/src/Cardano/CLI/Helper.hs index 28e3f947f7..7a05c7ea10 100644 --- a/cardano-cli/src/Cardano/CLI/Helpers.hs +++ b/cardano-cli/src/Cardano/CLI/Helper.hs @@ -4,7 +4,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Helpers +module Cardano.CLI.Helper ( HelpersError (..) , printWarning , deprecationWarning @@ -22,7 +22,7 @@ import Cardano.Api import Cardano.Api.Byron qualified as Byron import Cardano.Api.Ledger qualified as L -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Codec.CBOR.Pretty (prettyHexEnc) import Codec.CBOR.Read (DeserialiseFailure, deserialiseFromBytes) diff --git a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs index ff1698b610..959fdb1158 100644 --- a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs +++ b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs @@ -59,9 +59,9 @@ import Cardano.Api.Shelley , toShelleyStakeCredential ) -import Cardano.CLI.Orphans () -import Cardano.CLI.Types.Common (ViewOutputFormat (..)) -import Cardano.CLI.Types.MonadWarning (MonadWarning, runWarningIO) +import Cardano.CLI.Orphan () +import Cardano.CLI.Type.Common (ViewOutputFormat (..)) +import Cardano.CLI.Type.MonadWarning (MonadWarning, runWarningIO) import Cardano.Crypto.Hash (hashToTextAsHex) import Data.Aeson (Value (..), object, toJSON, (.=)) diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands.hs b/cardano-cli/src/Cardano/CLI/Legacy/Command.hs similarity index 76% rename from cardano-cli/src/Cardano/CLI/Legacy/Commands.hs rename to cardano-cli/src/Cardano/CLI/Legacy/Command.hs index 8ab27feb04..0ed16c70d0 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Commands.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Command.hs @@ -1,13 +1,13 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Legacy.Commands +module Cardano.CLI.Legacy.Command ( LegacyCmds (..) , renderLegacyCommand ) where -import Cardano.CLI.Legacy.Commands.Genesis -import Cardano.CLI.Legacy.Commands.Governance +import Cardano.CLI.Legacy.Genesis.Command +import Cardano.CLI.Legacy.Governance.Command import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Genesis.hs b/cardano-cli/src/Cardano/CLI/Legacy/Genesis/Command.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/Legacy/Commands/Genesis.hs rename to cardano-cli/src/Cardano/CLI/Legacy/Genesis/Command.hs index 3b763a8fb6..a0d3f6670c 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Genesis.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Genesis/Command.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Legacy.Commands.Genesis +module Cardano.CLI.Legacy.Genesis.Command ( LegacyGenesisCmds (..) , renderLegacyGenesisCmds ) @@ -11,7 +11,7 @@ import Cardano.Api.Byron qualified as Byron import Cardano.Api.Ledger (Coin) import Cardano.Api.Shelley -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/Legacy/Genesis/Run.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/Legacy/Run/Genesis.hs rename to cardano-cli/src/Cardano/CLI/Legacy/Genesis/Run.hs index aba7b8c4d6..278cf6ad95 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Run/Genesis.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Genesis/Run.hs @@ -4,7 +4,7 @@ {-# LANGUAGE LambdaCase #-} {-# OPTIONS_GHC -Wno-unticked-promoted-constructors #-} -module Cardano.CLI.Legacy.Run.Genesis +module Cardano.CLI.Legacy.Genesis.Run ( runLegacyGenesisCmds ) where @@ -13,15 +13,15 @@ import Cardano.Api import Cardano.Api.Byron qualified as Byron import Cardano.Api.Ledger (Coin (..)) -import Cardano.CLI.EraBased.Commands.Genesis +import Cardano.CLI.EraBased.Genesis.Command ( GenesisKeyGenGenesisCmdArgs (GenesisKeyGenGenesisCmdArgs) ) -import Cardano.CLI.EraBased.Commands.Genesis qualified as Cmd -import Cardano.CLI.EraBased.Run.Genesis -import Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData qualified as CreateTestnetData -import Cardano.CLI.Legacy.Commands.Genesis -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.GenesisCmdError +import Cardano.CLI.EraBased.Genesis.Command qualified as Cmd +import Cardano.CLI.EraBased.Genesis.Run +import Cardano.CLI.EraBased.Genesis.CreateTestnetData.Run qualified as CreateTestnetData +import Cardano.CLI.Legacy.Genesis.Command +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.GenesisCmdError runLegacyGenesisCmds :: LegacyGenesisCmds -> ExceptT GenesisCmdError IO () runLegacyGenesisCmds = \case diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs b/cardano-cli/src/Cardano/CLI/Legacy/Governance/Command.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs rename to cardano-cli/src/Cardano/CLI/Legacy/Governance/Command.hs index c9f148d232..df9f5f0222 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Governance/Command.hs @@ -2,14 +2,14 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Legacy.Commands.Governance where +module Cardano.CLI.Legacy.Governance.Command where import Cardano.Api import Cardano.Api.Ledger (Coin) import Cardano.Api.Shelley -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Key import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs b/cardano-cli/src/Cardano/CLI/Legacy/Governance/Run.hs similarity index 92% rename from cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs rename to cardano-cli/src/Cardano/CLI/Legacy/Governance/Run.hs index e9f3ccf8a9..8d765f427f 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Governance/Run.hs @@ -5,7 +5,7 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Legacy.Run.Governance +module Cardano.CLI.Legacy.Governance.Run ( runLegacyGovernanceCmds ) where @@ -14,15 +14,15 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.EraBased.Commands.Governance.Poll qualified as Cmd -import Cardano.CLI.EraBased.Run.Governance -import Cardano.CLI.EraBased.Run.Governance.GenesisKeyDelegationCertificate +import Cardano.CLI.EraBased.Governance.Poll.Command qualified as Cmd +import Cardano.CLI.EraBased.Governance.Run +import Cardano.CLI.EraBased.Governance.GenesisKeyDelegationCertificate.Run ( runGovernanceGenesisKeyDelegationCertificate ) -import Cardano.CLI.EraBased.Run.Governance.Poll -import Cardano.CLI.Legacy.Commands.Governance -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.GovernanceCmdError +import Cardano.CLI.EraBased.Governance.Poll.Run +import Cardano.CLI.Legacy.Governance.Command +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.GovernanceCmdError import Control.Monad import Data.Aeson (eitherDecode) diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Option.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/Legacy/Options.hs rename to cardano-cli/src/Cardano/CLI/Legacy/Option.hs index 64efb24d30..dd9d154eef 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Option.hs @@ -3,12 +3,12 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Legacy.Options +module Cardano.CLI.Legacy.Option ( -- * CLI command parser parseLegacyCmds -- * CLI command and flag types - , module Cardano.CLI.Legacy.Commands + , module Cardano.CLI.Legacy.Command -- * Field parser and renderers , parseTxIn @@ -23,12 +23,12 @@ import Cardano.Api.Byron qualified as Byron import Cardano.Api.Ledger (Coin (..)) import Cardano.CLI.Environment -import Cardano.CLI.EraBased.Options.Common -import Cardano.CLI.Legacy.Commands -import Cardano.CLI.Legacy.Commands.Genesis -import Cardano.CLI.Legacy.Commands.Governance +import Cardano.CLI.EraBased.Common.Option +import Cardano.CLI.Legacy.Command +import Cardano.CLI.Legacy.Genesis.Command +import Cardano.CLI.Legacy.Governance.Command import Cardano.CLI.Parser -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Foldable import Data.Maybe (fromMaybe) diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run.hs index 41744c8250..6aa04a65bb 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Run.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Run.hs @@ -5,10 +5,10 @@ module Cardano.CLI.Legacy.Run ) where -import Cardano.CLI.Legacy.Options -import Cardano.CLI.Legacy.Run.Genesis -import Cardano.CLI.Legacy.Run.Governance -import Cardano.CLI.Types.Errors.CmdError +import Cardano.CLI.Legacy.Genesis.Run +import Cardano.CLI.Legacy.Governance.Run +import Cardano.CLI.Legacy.Option +import Cardano.CLI.Type.Error.CmdError import Control.Monad.Trans.Except (ExceptT) import Control.Monad.Trans.Except.Extra (firstExceptT) diff --git a/cardano-cli/src/Cardano/CLI/Options.hs b/cardano-cli/src/Cardano/CLI/Option.hs similarity index 87% rename from cardano-cli/src/Cardano/CLI/Options.hs rename to cardano-cli/src/Cardano/CLI/Option.hs index 0601fc800d..b93cb65dbd 100644 --- a/cardano-cli/src/Cardano/CLI/Options.hs +++ b/cardano-cli/src/Cardano/CLI/Option.hs @@ -3,25 +3,25 @@ {- HLINT ignore "Monoid law, left identity" -} -module Cardano.CLI.Options +module Cardano.CLI.Option ( opts , pref ) where -import Cardano.CLI.Byron.Parsers (backwardsCompatibilityCommands, parseByronCommands) -import Cardano.CLI.Compatible.Commands +import Cardano.CLI.Byron.Parser (backwardsCompatibilityCommands, parseByronCommands) import Cardano.CLI.Environment (EnvCli) -import Cardano.CLI.EraBased.Options.Common -import Cardano.CLI.EraBased.Options.Era -import Cardano.CLI.EraBased.Options.Query (pQueryCmdsTopLevel) -import Cardano.CLI.Legacy.Options (parseLegacyCmds) -import Cardano.CLI.Options.Address -import Cardano.CLI.Options.Debug -import Cardano.CLI.Options.Hash -import Cardano.CLI.Options.Key -import Cardano.CLI.Options.Node -import Cardano.CLI.Options.Ping (parsePingCmd) +import Cardano.CLI.EraBased.Common.Option +import Cardano.CLI.EraBased.Option +import Cardano.CLI.Compatible.Option +import Cardano.CLI.EraBased.Query.Option (pQueryCmdsTopLevel) +import Cardano.CLI.Legacy.Option (parseLegacyCmds) +import Cardano.CLI.EraIndependent.Address.Option +import Cardano.CLI.EraIndependent.Debug.Option +import Cardano.CLI.EraIndependent.Hash.Option +import Cardano.CLI.EraIndependent.Key.Option +import Cardano.CLI.EraIndependent.Node.Option +import Cardano.CLI.EraIndependent.Ping.Option (parsePingCmd) import Cardano.CLI.Parser import Cardano.CLI.Render (customRenderHelp) import Cardano.CLI.Run (ClientCommand (..)) diff --git a/cardano-cli/src/Cardano/CLI/Orphans.hs b/cardano-cli/src/Cardano/CLI/Orphan.hs similarity index 97% rename from cardano-cli/src/Cardano/CLI/Orphans.hs rename to cardano-cli/src/Cardano/CLI/Orphan.hs index ddb158ffd3..ff6d2a31f8 100644 --- a/cardano-cli/src/Cardano/CLI/Orphans.hs +++ b/cardano-cli/src/Cardano/CLI/Orphan.hs @@ -3,7 +3,7 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# OPTIONS_GHC -Wno-orphans #-} -module Cardano.CLI.Orphans +module Cardano.CLI.Orphan ( ) where diff --git a/cardano-cli/src/Cardano/CLI/Parser.hs b/cardano-cli/src/Cardano/CLI/Parser.hs index f4d5a49fcf..b2a0b07c31 100644 --- a/cardano-cli/src/Cardano/CLI/Parser.hs +++ b/cardano-cli/src/Cardano/CLI/Parser.hs @@ -20,7 +20,7 @@ where import Cardano.Api.Ledger qualified as L -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Attoparsec.ByteString.Char8 qualified as Atto import Data.ByteString (ByteString) diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs index 66b2bb3f68..d3f3ccc03c 100644 --- a/cardano-cli/src/Cardano/CLI/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Read.hs @@ -100,21 +100,21 @@ import Cardano.Api.Shelley as Api import Cardano.Binary qualified as CBOR import Cardano.CLI.EraBased.Script.Proposal.Read -import Cardano.CLI.EraBased.Script.Proposal.Types +import Cardano.CLI.EraBased.Script.Proposal.Type ( CliProposalScriptRequirements , ProposalScriptWitness ) -import Cardano.CLI.EraBased.Script.Types +import Cardano.CLI.EraBased.Script.Type import Cardano.CLI.EraBased.Script.Vote.Read -import Cardano.CLI.EraBased.Script.Vote.Types -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.DelegationError -import Cardano.CLI.Types.Errors.PlutusScriptDecodeError -import Cardano.CLI.Types.Errors.ScriptDataError -import Cardano.CLI.Types.Errors.ScriptDecodeError -import Cardano.CLI.Types.Errors.StakeCredentialError -import Cardano.CLI.Types.Governance -import Cardano.CLI.Types.Key +import Cardano.CLI.EraBased.Script.Vote.Type +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.DelegationError +import Cardano.CLI.Type.Error.PlutusScriptDecodeError +import Cardano.CLI.Type.Error.ScriptDataError +import Cardano.CLI.Type.Error.ScriptDecodeError +import Cardano.CLI.Type.Error.StakeCredentialError +import Cardano.CLI.Type.Governance +import Cardano.CLI.Type.Key import Cardano.Crypto.Hash qualified as Crypto import Prelude @@ -590,7 +590,7 @@ readWitnessSigningData (KeyWitnessSigningData skFile mbByronAddr) = do Left ReadWitnessSigningDataSigningKeyAndAddressMismatch where -- If you update these variables, consider updating the ones with the same - -- names in Cardano.CLI.Types.Key + -- names in Cardano.CLI.Type.Key textEnvFileTypes = [ FromSomeType (AsSigningKey AsByronKey) (`AByronSigningWitness` mbByronAddr) , FromSomeType (AsSigningKey AsPaymentKey) APaymentSigningWitness diff --git a/cardano-cli/src/Cardano/CLI/Run.hs b/cardano-cli/src/Cardano/CLI/Run.hs index a6bf829d89..22a695b0a6 100644 --- a/cardano-cli/src/Cardano/CLI/Run.hs +++ b/cardano-cli/src/Cardano/CLI/Run.hs @@ -18,31 +18,31 @@ import Cardano.CLI.Byron.Run , renderByronClientCmdError , runByronClientCommand ) -import Cardano.CLI.Commands -import Cardano.CLI.Compatible.Commands +import Cardano.CLI.Command +import Cardano.CLI.Compatible.Command import Cardano.CLI.Compatible.Run -import Cardano.CLI.EraBased.Commands.TopLevelCommands +import Cardano.CLI.EraBased.Command +import Cardano.CLI.EraBased.Query.Run import Cardano.CLI.EraBased.Run -import Cardano.CLI.EraBased.Run.Query -import Cardano.CLI.Legacy.Commands -import Cardano.CLI.Legacy.Run (runLegacyCmds) -import Cardano.CLI.Render (customRenderHelp) -import Cardano.CLI.Run.Address -import Cardano.CLI.Run.Debug -import Cardano.CLI.Run.Hash (runHashCmds) -import Cardano.CLI.Run.Key -import Cardano.CLI.Run.Node -import Cardano.CLI.Run.Ping +import Cardano.CLI.EraIndependent.Address.Run +import Cardano.CLI.EraIndependent.Debug.Run +import Cardano.CLI.EraIndependent.Hash.Run (runHashCmds) +import Cardano.CLI.EraIndependent.Key.Run +import Cardano.CLI.EraIndependent.Node.Run +import Cardano.CLI.EraIndependent.Ping.Run ( PingClientCmdError (..) , renderPingClientCmdError , runPingCmd ) -import Cardano.CLI.Types.Errors.AddressCmdError -import Cardano.CLI.Types.Errors.CmdError -import Cardano.CLI.Types.Errors.HashCmdError -import Cardano.CLI.Types.Errors.KeyCmdError -import Cardano.CLI.Types.Errors.NodeCmdError -import Cardano.CLI.Types.Errors.QueryCmdError +import Cardano.CLI.Legacy.Command +import Cardano.CLI.Legacy.Run (runLegacyCmds) +import Cardano.CLI.Render (customRenderHelp) +import Cardano.CLI.Type.Error.AddressCmdError +import Cardano.CLI.Type.Error.CmdError +import Cardano.CLI.Type.Error.HashCmdError +import Cardano.CLI.Type.Error.KeyCmdError +import Cardano.CLI.Type.Error.NodeCmdError +import Cardano.CLI.Type.Error.QueryCmdError import Cardano.Git.Rev (gitRev) import Control.Monad diff --git a/cardano-cli/src/Cardano/CLI/Types/Common.hs b/cardano-cli/src/Cardano/CLI/Type/Common.hs similarity index 99% rename from cardano-cli/src/Cardano/CLI/Types/Common.hs rename to cardano-cli/src/Cardano/CLI/Type/Common.hs index e147f7bcc5..945d31161d 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Common.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Common.hs @@ -5,7 +5,7 @@ {-# LANGUAGE GeneralisedNewtypeDeriving #-} {-# LANGUAGE RankNTypes #-} -module Cardano.CLI.Types.Common +module Cardano.CLI.Type.Common ( AllOrOnly (..) , AllOutputFormats (..) , AddressKeyType (..) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/AddressCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/AddressCmdError.hs similarity index 91% rename from cardano-cli/src/Cardano/CLI/Types/Errors/AddressCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/AddressCmdError.hs index 1b1c2fb73b..aba6ef8e84 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/AddressCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/AddressCmdError.hs @@ -5,7 +5,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Types.Errors.AddressCmdError +module Cardano.CLI.Type.Error.AddressCmdError ( AddressCmdError (..) , renderAddressCmdError ) @@ -14,8 +14,8 @@ where import Cardano.Api import Cardano.CLI.Read -import Cardano.CLI.Types.Errors.AddressInfoError -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Error.AddressInfoError +import Cardano.CLI.Type.Key ( VerificationKeyTextOrFileError (..) , renderVerificationKeyTextOrFileError ) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/AddressInfoError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/AddressInfoError.hs similarity index 86% rename from cardano-cli/src/Cardano/CLI/Types/Errors/AddressInfoError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/AddressInfoError.hs index f0ac9b511b..bb0fa21d93 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/AddressInfoError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/AddressInfoError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.AddressInfoError +module Cardano.CLI.Type.Error.AddressInfoError ( AddressInfoError (..) ) where diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/BootstrapWitnessError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/BootstrapWitnessError.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/Types/Errors/BootstrapWitnessError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/BootstrapWitnessError.hs index af07273a3f..5692b2c9bb 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/BootstrapWitnessError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/BootstrapWitnessError.hs @@ -1,4 +1,4 @@ -module Cardano.CLI.Types.Errors.BootstrapWitnessError +module Cardano.CLI.Type.Error.BootstrapWitnessError ( BootstrapWitnessError (..) , renderBootstrapWitnessError ) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/CardanoAddressSigningKeyConversionError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/CardanoAddressSigningKeyConversionError.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/Types/Errors/CardanoAddressSigningKeyConversionError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/CardanoAddressSigningKeyConversionError.hs index 41f355a38b..49ba7e8f15 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/CardanoAddressSigningKeyConversionError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/CardanoAddressSigningKeyConversionError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.CardanoAddressSigningKeyConversionError +module Cardano.CLI.Type.Error.CardanoAddressSigningKeyConversionError ( CardanoAddressSigningKeyConversionError (..) ) where diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/CmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/CmdError.hs similarity index 69% rename from cardano-cli/src/Cardano/CLI/Types/Errors/CmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/CmdError.hs index 08af0ccb19..a7b2fbf913 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/CmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/CmdError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.CmdError +module Cardano.CLI.Type.Error.CmdError ( CmdError (..) , renderCmdError ) @@ -9,22 +9,22 @@ where import Cardano.Api import Cardano.CLI.Render -import Cardano.CLI.Types.Errors.AddressCmdError -import Cardano.CLI.Types.Errors.DelegationError -import Cardano.CLI.Types.Errors.GenesisCmdError -import Cardano.CLI.Types.Errors.GovernanceActionsError -import Cardano.CLI.Types.Errors.GovernanceCmdError -import Cardano.CLI.Types.Errors.GovernanceCommitteeError -import Cardano.CLI.Types.Errors.GovernanceQueryError -import Cardano.CLI.Types.Errors.GovernanceVoteCmdError -import Cardano.CLI.Types.Errors.KeyCmdError -import Cardano.CLI.Types.Errors.NodeCmdError -import Cardano.CLI.Types.Errors.QueryCmdError -import Cardano.CLI.Types.Errors.RegistrationError -import Cardano.CLI.Types.Errors.StakeAddressCmdError -import Cardano.CLI.Types.Errors.StakePoolCmdError -import Cardano.CLI.Types.Errors.TextViewFileError -import Cardano.CLI.Types.Errors.TxCmdError +import Cardano.CLI.Type.Error.AddressCmdError +import Cardano.CLI.Type.Error.DelegationError +import Cardano.CLI.Type.Error.GenesisCmdError +import Cardano.CLI.Type.Error.GovernanceActionsError +import Cardano.CLI.Type.Error.GovernanceCmdError +import Cardano.CLI.Type.Error.GovernanceCommitteeError +import Cardano.CLI.Type.Error.GovernanceQueryError +import Cardano.CLI.Type.Error.GovernanceVoteCmdError +import Cardano.CLI.Type.Error.KeyCmdError +import Cardano.CLI.Type.Error.NodeCmdError +import Cardano.CLI.Type.Error.QueryCmdError +import Cardano.CLI.Type.Error.RegistrationError +import Cardano.CLI.Type.Error.StakeAddressCmdError +import Cardano.CLI.Type.Error.StakePoolCmdError +import Cardano.CLI.Type.Error.TextViewFileError +import Cardano.CLI.Type.Error.TxCmdError import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/DebugCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/DebugCmdError.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/Types/Errors/DebugCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/DebugCmdError.hs index fe61b5447a..f767f42605 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/DebugCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/DebugCmdError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.DebugCmdError +module Cardano.CLI.Type.Error.DebugCmdError ( DebugCmdError (..) ) where @@ -8,7 +8,7 @@ where import Cardano.Api import Cardano.Api.Byron qualified as Byron -import Cardano.CLI.Types.Errors.TxCmdError +import Cardano.CLI.Type.Error.TxCmdError import Data.Text (Text) import Data.Text.Lazy.Builder qualified as Text diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/DelegationError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/DelegationError.hs similarity index 89% rename from cardano-cli/src/Cardano/CLI/Types/Errors/DelegationError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/DelegationError.hs index e19599bba6..8ff5288a4d 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/DelegationError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/DelegationError.hs @@ -2,14 +2,14 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.DelegationError +module Cardano.CLI.Type.Error.DelegationError ( DelegationError (..) ) where import Cardano.Api -import Cardano.CLI.Types.Errors.StakeCredentialError +import Cardano.CLI.Type.Error.StakeCredentialError import GHC.Generics (Generic) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GenesisCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/GenesisCmdError.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/Types/Errors/GenesisCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/GenesisCmdError.hs index e1ad297218..a5d4b796ea 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/GenesisCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/GenesisCmdError.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.GenesisCmdError +module Cardano.CLI.Type.Error.GenesisCmdError ( GenesisCmdError (..) ) where @@ -9,12 +9,12 @@ where import Cardano.Api import Cardano.CLI.Byron.Genesis as Byron -import Cardano.CLI.EraBased.Run.Governance.Committee (GovernanceCommitteeError) -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.AddressCmdError -import Cardano.CLI.Types.Errors.NodeCmdError -import Cardano.CLI.Types.Errors.StakeAddressCmdError -import Cardano.CLI.Types.Errors.StakePoolCmdError +import Cardano.CLI.EraBased.Governance.Committee.Run (GovernanceCommitteeError) +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.AddressCmdError +import Cardano.CLI.Type.Error.NodeCmdError +import Cardano.CLI.Type.Error.StakeAddressCmdError +import Cardano.CLI.Type.Error.StakePoolCmdError import Control.Exception (IOException) import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/GovernanceActionsError.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/GovernanceActionsError.hs index 9b412af0cd..69c6f561a7 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/GovernanceActionsError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.GovernanceActionsError +module Cardano.CLI.Type.Error.GovernanceActionsError ( GovernanceActionsError (..) , AnchorDataTypeCheck (..) ) @@ -10,8 +10,8 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.CLI.Read -import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError) -import Cardano.CLI.Types.Errors.StakeCredentialError +import Cardano.CLI.Type.Error.HashCmdError (FetchURLError) +import Cardano.CLI.Type.Error.StakeCredentialError import Control.Exception (displayException) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/GovernanceCmdError.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/GovernanceCmdError.hs index 784fd7e468..3cf51c382d 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/GovernanceCmdError.hs @@ -2,15 +2,15 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.GovernanceCmdError where +module Cardano.CLI.Type.Error.GovernanceCmdError where import Cardano.Api import Cardano.Api.Shelley import Cardano.Binary (DecoderError) import Cardano.CLI.Read -import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError, HashCheckError) -import Cardano.CLI.Types.Errors.StakeAddressCmdError +import Cardano.CLI.Type.Error.HashCmdError (FetchURLError, HashCheckError) +import Cardano.CLI.Type.Error.StakeAddressCmdError import Control.Exception (displayException) import Data.List qualified as List diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCommitteeError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/GovernanceCommitteeError.hs similarity index 89% rename from cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCommitteeError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/GovernanceCommitteeError.hs index e4b136c628..75bb5278a3 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCommitteeError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/GovernanceCommitteeError.hs @@ -1,14 +1,14 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.GovernanceCommitteeError +module Cardano.CLI.Type.Error.GovernanceCommitteeError ( GovernanceCommitteeError (..) ) where import Cardano.Api -import Cardano.CLI.Types.Errors.HashCmdError (HashCheckError) -import Cardano.CLI.Types.Errors.ScriptDecodeError +import Cardano.CLI.Type.Error.HashCmdError (HashCheckError) +import Cardano.CLI.Type.Error.ScriptDecodeError import Control.Exception (displayException) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/GovernanceQueryError.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/GovernanceQueryError.hs index 46c145cd70..5fe580f457 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/GovernanceQueryError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.GovernanceQueryError where +module Cardano.CLI.Type.Error.GovernanceQueryError where import Cardano.Api import Cardano.Api.Consensus (EraMismatch) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceVoteCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/GovernanceVoteCmdError.hs similarity index 90% rename from cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceVoteCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/GovernanceVoteCmdError.hs index 861c2599a9..47d40b4316 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceVoteCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/GovernanceVoteCmdError.hs @@ -2,14 +2,14 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.GovernanceVoteCmdError where +module Cardano.CLI.Type.Error.GovernanceVoteCmdError where import Cardano.Api.Shelley import Cardano.Binary (DecoderError) -import Cardano.CLI.EraBased.Script.Types +import Cardano.CLI.EraBased.Script.Type import Cardano.CLI.Read (VoteError) -import Cardano.CLI.Types.Errors.HashCmdError (HashCheckError) +import Cardano.CLI.Type.Error.HashCmdError (HashCheckError) import Control.Exception (displayException) import Data.Text.Lazy.Builder qualified as TL diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/HashCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/HashCmdError.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/Types/Errors/HashCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/HashCmdError.hs index b0e4c196d5..5e9978ca3a 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/HashCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/HashCmdError.hs @@ -1,7 +1,7 @@ {-# LANGUAGE InstanceSigs #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.HashCmdError +module Cardano.CLI.Type.Error.HashCmdError ( HashCmdError (..) , HttpRequestError (..) , FetchURLError (..) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/ItnKeyConversionError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/ItnKeyConversionError.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/Types/Errors/ItnKeyConversionError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/ItnKeyConversionError.hs index eef6877ee2..c5d90143ac 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/ItnKeyConversionError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/ItnKeyConversionError.hs @@ -4,7 +4,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Types.Errors.ItnKeyConversionError +module Cardano.CLI.Type.Error.ItnKeyConversionError ( ItnKeyConversionError (..) , renderConversionError ) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/KeyCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/KeyCmdError.hs similarity index 91% rename from cardano-cli/src/Cardano/CLI/Types/Errors/KeyCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/KeyCmdError.hs index a46449c0d8..246bd27f46 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/KeyCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/KeyCmdError.hs @@ -3,7 +3,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Types.Errors.KeyCmdError +module Cardano.CLI.Type.Error.KeyCmdError ( KeyCmdError (..) , renderKeyCmdError ) @@ -12,9 +12,9 @@ where import Cardano.Api import Cardano.CLI.Byron.Key qualified as Byron -import Cardano.CLI.Types.Errors.CardanoAddressSigningKeyConversionError -import Cardano.CLI.Types.Errors.ItnKeyConversionError -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Error.CardanoAddressSigningKeyConversionError +import Cardano.CLI.Type.Error.ItnKeyConversionError +import Cardano.CLI.Type.Key import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/NodeCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/NodeCmdError.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/Types/Errors/NodeCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/NodeCmdError.hs index 4426000ab0..ab98afca8f 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/NodeCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/NodeCmdError.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.NodeCmdError +module Cardano.CLI.Type.Error.NodeCmdError ( NodeCmdError (..) , renderNodeCmdError ) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/NodeEraMismatchError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/NodeEraMismatchError.hs similarity index 81% rename from cardano-cli/src/Cardano/CLI/Types/Errors/NodeEraMismatchError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/NodeEraMismatchError.hs index 5c07dc9af4..25364499d6 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/NodeEraMismatchError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/NodeEraMismatchError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE GADTs #-} -module Cardano.CLI.Types.Errors.NodeEraMismatchError +module Cardano.CLI.Type.Error.NodeEraMismatchError ( NodeEraMismatchError (..) ) where diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/PlutusScriptDecodeError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/PlutusScriptDecodeError.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/Types/Errors/PlutusScriptDecodeError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/PlutusScriptDecodeError.hs index 4dc93e2194..ef07369936 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/PlutusScriptDecodeError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/PlutusScriptDecodeError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.PlutusScriptDecodeError +module Cardano.CLI.Type.Error.PlutusScriptDecodeError ( PlutusScriptDecodeError (..) ) where diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/ProtocolParamsError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/ProtocolParamsError.hs similarity index 92% rename from cardano-cli/src/Cardano/CLI/Types/Errors/ProtocolParamsError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/ProtocolParamsError.hs index 7023473cee..36e03b2cf1 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/ProtocolParamsError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/ProtocolParamsError.hs @@ -4,7 +4,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Types.Errors.ProtocolParamsError +module Cardano.CLI.Type.Error.ProtocolParamsError ( ProtocolParamsError (..) , renderProtocolParamsError ) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/QueryCmdError.hs similarity index 95% rename from cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/QueryCmdError.hs index dbe642afbc..66b6e81472 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/QueryCmdError.hs @@ -9,7 +9,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Types.Errors.QueryCmdError +module Cardano.CLI.Type.Error.QueryCmdError ( QueryCmdError (..) , renderQueryCmdError , mkEraMismatchError @@ -21,9 +21,9 @@ import Cardano.Api.Consensus as Consensus (EraMismatch (..), PastHorizonExceptio import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) import Cardano.Binary (DecoderError) -import Cardano.CLI.Helpers (HelpersError (..), renderHelpersError) -import Cardano.CLI.Types.Errors.GenesisCmdError -import Cardano.CLI.Types.Errors.NodeEraMismatchError (NodeEraMismatchError (..)) +import Cardano.CLI.Helper (HelpersError (..), renderHelpersError) +import Cardano.CLI.Type.Error.GenesisCmdError +import Cardano.CLI.Type.Error.NodeEraMismatchError (NodeEraMismatchError (..)) import Data.ByteString.Lazy.Char8 qualified as LBS import Data.Text.Lazy.Builder (toLazyText) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/RegistrationError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/RegistrationError.hs similarity index 87% rename from cardano-cli/src/Cardano/CLI/Types/Errors/RegistrationError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/RegistrationError.hs index 750c543125..2d189a0d1a 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/RegistrationError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/RegistrationError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.RegistrationError +module Cardano.CLI.Type.Error.RegistrationError ( RegistrationError (..) ) where @@ -8,9 +8,9 @@ where import Cardano.Api import Cardano.Api.Ledger qualified as L -import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError, HashCheckError) -import Cardano.CLI.Types.Errors.StakeAddressRegistrationError -import Cardano.CLI.Types.Errors.StakeCredentialError +import Cardano.CLI.Type.Error.HashCmdError (FetchURLError, HashCheckError) +import Cardano.CLI.Type.Error.StakeAddressRegistrationError +import Cardano.CLI.Type.Error.StakeCredentialError import Control.Exception (displayException) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDataError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/ScriptDataError.hs similarity index 96% rename from cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDataError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/ScriptDataError.hs index 1224b7b42f..007049d9e0 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDataError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/ScriptDataError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.ScriptDataError +module Cardano.CLI.Type.Error.ScriptDataError ( ScriptDataError (..) , renderScriptDataError ) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDecodeError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/ScriptDecodeError.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDecodeError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/ScriptDecodeError.hs index c73ab6bb4d..31593bf64b 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDecodeError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/ScriptDecodeError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.ScriptDecodeError +module Cardano.CLI.Type.Error.ScriptDecodeError ( ScriptDecodeError (..) ) where diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/StakeAddressCmdError.hs similarity index 77% rename from cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/StakeAddressCmdError.hs index 76673cfe68..f4ec957995 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/StakeAddressCmdError.hs @@ -1,16 +1,16 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.StakeAddressCmdError +module Cardano.CLI.Type.Error.StakeAddressCmdError ( StakeAddressCmdError (..) ) where import Cardano.Api -import Cardano.CLI.Types.Errors.DelegationError -import Cardano.CLI.Types.Errors.ScriptDecodeError -import Cardano.CLI.Types.Errors.StakeAddressRegistrationError -import Cardano.CLI.Types.Errors.StakeCredentialError +import Cardano.CLI.Type.Error.DelegationError +import Cardano.CLI.Type.Error.ScriptDecodeError +import Cardano.CLI.Type.Error.StakeAddressRegistrationError +import Cardano.CLI.Type.Error.StakeCredentialError data StakeAddressCmdError = StakeAddressCmdReadKeyFileError !(FileError InputDecodeError) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/StakeAddressDelegationError.hs similarity index 88% rename from cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/StakeAddressDelegationError.hs index efc917e0b7..b0c4e3231d 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/StakeAddressDelegationError.hs @@ -1,7 +1,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Types.Errors.StakeAddressDelegationError +module Cardano.CLI.Type.Error.StakeAddressDelegationError ( StakeAddressDelegationError (..) ) where diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressRegistrationError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/StakeAddressRegistrationError.hs similarity index 84% rename from cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressRegistrationError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/StakeAddressRegistrationError.hs index 70ea70801e..b85706f3d7 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressRegistrationError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/StakeAddressRegistrationError.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.StakeAddressRegistrationError +module Cardano.CLI.Type.Error.StakeAddressRegistrationError ( StakeAddressRegistrationError (..) ) where diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeCredentialError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/StakeCredentialError.hs similarity index 81% rename from cardano-cli/src/Cardano/CLI/Types/Errors/StakeCredentialError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/StakeCredentialError.hs index 0d43a7a537..2b1e54d0d3 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeCredentialError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/StakeCredentialError.hs @@ -1,13 +1,13 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.StakeCredentialError +module Cardano.CLI.Type.Error.StakeCredentialError ( StakeCredentialError (..) ) where import Cardano.Api -import Cardano.CLI.Types.Errors.ScriptDecodeError +import Cardano.CLI.Type.Error.ScriptDecodeError data StakeCredentialError = StakeCredentialScriptDecodeError (FileError ScriptDecodeError) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakePoolCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/StakePoolCmdError.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/Types/Errors/StakePoolCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/StakePoolCmdError.hs index 1f3bc20839..20408f80e2 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakePoolCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/StakePoolCmdError.hs @@ -3,7 +3,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE RankNTypes #-} -module Cardano.CLI.Types.Errors.StakePoolCmdError +module Cardano.CLI.Type.Error.StakePoolCmdError ( StakePoolCmdError (..) , renderStakePoolCmdError ) @@ -12,7 +12,7 @@ where import Cardano.Api import Cardano.Api.Shelley (Hash (StakePoolMetadataHash)) -import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError) +import Cardano.CLI.Type.Error.HashCmdError (FetchURLError) data StakePoolCmdError = StakePoolCmdReadFileError !(FileError TextEnvelopeError) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TextViewFileError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/TextViewFileError.hs similarity index 82% rename from cardano-cli/src/Cardano/CLI/Types/Errors/TextViewFileError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/TextViewFileError.hs index ba12230dae..8da8c284c5 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/TextViewFileError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/TextViewFileError.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.Errors.TextViewFileError +module Cardano.CLI.Type.Error.TextViewFileError ( TextViewFileError (..) , renderTextViewFileError ) @@ -9,7 +9,7 @@ where import Cardano.Api -import Cardano.CLI.Helpers (HelpersError, renderHelpersError) +import Cardano.CLI.Helper (HelpersError, renderHelpersError) data TextViewFileError = TextViewReadFileError (FileError TextEnvelopeError) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/TxCmdError.hs similarity index 94% rename from cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/TxCmdError.hs index c6ba604628..fe5f5ab369 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/TxCmdError.hs @@ -6,7 +6,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Types.Errors.TxCmdError +module Cardano.CLI.Type.Error.TxCmdError ( TxCmdError (..) , AnyTxBodyErrorAutoBalance (..) , AnyTxCmdTxExecUnitsErr (..) @@ -20,17 +20,17 @@ import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley import Cardano.CLI.EraBased.Script.Spend.Read -import Cardano.CLI.EraBased.Script.Types +import Cardano.CLI.EraBased.Script.Type import Cardano.CLI.Read -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Errors.BootstrapWitnessError -import Cardano.CLI.Types.Errors.HashCmdError (HashCheckError) -import Cardano.CLI.Types.Errors.NodeEraMismatchError -import Cardano.CLI.Types.Errors.NodeEraMismatchError qualified as NEM -import Cardano.CLI.Types.Errors.ProtocolParamsError -import Cardano.CLI.Types.Errors.TxValidationError -import Cardano.CLI.Types.Output -import Cardano.CLI.Types.TxFeature +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Error.BootstrapWitnessError +import Cardano.CLI.Type.Error.HashCmdError (HashCheckError) +import Cardano.CLI.Type.Error.NodeEraMismatchError +import Cardano.CLI.Type.Error.NodeEraMismatchError qualified as NEM +import Cardano.CLI.Type.Error.ProtocolParamsError +import Cardano.CLI.Type.Error.TxValidationError +import Cardano.CLI.Type.Output +import Cardano.CLI.Type.TxFeature import Cardano.Prelude qualified as List import Data.Set (Set) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs b/cardano-cli/src/Cardano/CLI/Type/Error/TxValidationError.hs similarity index 99% rename from cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs rename to cardano-cli/src/Cardano/CLI/Type/Error/TxValidationError.hs index 54554967f5..8dc44cbd44 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Error/TxValidationError.hs @@ -6,7 +6,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -module Cardano.CLI.Types.Errors.TxValidationError +module Cardano.CLI.Type.Error.TxValidationError ( TxAuxScriptsValidationError (..) , TxGovDuplicateVotes (..) , TxNotSupportedInEraValidationError (..) @@ -26,7 +26,7 @@ where import Cardano.Api import Cardano.Api.Shelley -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Prelude diff --git a/cardano-cli/src/Cardano/CLI/Types/Governance.hs b/cardano-cli/src/Cardano/CLI/Type/Governance.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/Types/Governance.hs rename to cardano-cli/src/Cardano/CLI/Type/Governance.hs index 5ead9d672d..c1d8d29aec 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Governance.hs @@ -1,12 +1,12 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} -module Cardano.CLI.Types.Governance where +module Cardano.CLI.Type.Governance where import Cardano.Api import Cardano.Api.Shelley -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Key ( DRepHashSource , VerificationKeyOrHashOrFile , VerificationKeyOrHashOrFileOrScriptHash diff --git a/cardano-cli/src/Cardano/CLI/Types/Key.hs b/cardano-cli/src/Cardano/CLI/Type/Key.hs similarity index 99% rename from cardano-cli/src/Cardano/CLI/Types/Key.hs rename to cardano-cli/src/Cardano/CLI/Type/Key.hs index 875d5de4af..789516e737 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Key.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Key.hs @@ -9,7 +9,7 @@ {-# LANGUAGE UndecidableInstances #-} -- | Shelley CLI option data types and functions for cryptographic keys. -module Cardano.CLI.Types.Key +module Cardano.CLI.Type.Key ( VerificationKeyOrFile (..) , readVerificationKeyOrFile , readVerificationKeyOrTextEnvFile @@ -48,7 +48,7 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Data.Bifunctor (Bifunctor (..)) import Data.ByteString qualified as BS diff --git a/cardano-cli/src/Cardano/CLI/Types/Key/VerificationKey.hs b/cardano-cli/src/Cardano/CLI/Type/Key/VerificationKey.hs similarity index 93% rename from cardano-cli/src/Cardano/CLI/Types/Key/VerificationKey.hs rename to cardano-cli/src/Cardano/CLI/Type/Key/VerificationKey.hs index 864474e916..748e77c026 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Key/VerificationKey.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Key/VerificationKey.hs @@ -1,6 +1,6 @@ {-# LANGUAGE DataKinds #-} -module Cardano.CLI.Types.Key.VerificationKey +module Cardano.CLI.Type.Key.VerificationKey ( AnyVerificationKeySource (..) , AnyVerificationKeyText (..) ) diff --git a/cardano-cli/src/Cardano/CLI/Types/MonadWarning.hs b/cardano-cli/src/Cardano/CLI/Type/MonadWarning.hs similarity index 97% rename from cardano-cli/src/Cardano/CLI/Types/MonadWarning.hs rename to cardano-cli/src/Cardano/CLI/Type/MonadWarning.hs index c0efc1a74b..a392513afb 100644 --- a/cardano-cli/src/Cardano/CLI/Types/MonadWarning.hs +++ b/cardano-cli/src/Cardano/CLI/Type/MonadWarning.hs @@ -4,7 +4,7 @@ {-# LANGUAGE InstanceSigs #-} -- | --- Module : Cardano.CLI.Types.MonadWarning +-- Module : Cardano.CLI.Type.MonadWarning -- -- This module defines the 'MonadWarning' type class, which provides a common -- interface for monads that support reporting warning messages without @@ -37,7 +37,7 @@ -- result <- runWarningIO $ computeWithWarning (-4) -- putStrLn $ "Result: " ++ show result -- @ -module Cardano.CLI.Types.MonadWarning +module Cardano.CLI.Type.MonadWarning ( MonadWarning (..) , WarningIO , WarningStateT diff --git a/cardano-cli/src/Cardano/CLI/Types/Output.hs b/cardano-cli/src/Cardano/CLI/Type/Output.hs similarity index 99% rename from cardano-cli/src/Cardano/CLI/Types/Output.hs rename to cardano-cli/src/Cardano/CLI/Type/Output.hs index 392693443f..870645bc68 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Output.hs +++ b/cardano-cli/src/Cardano/CLI/Type/Output.hs @@ -5,7 +5,7 @@ -- | Types that are used when writing to standard output or to files. -- These types (and their encodings) are typically consumed by users of @cardano-cli@. -module Cardano.CLI.Types.Output +module Cardano.CLI.Type.Output ( PlutusScriptCostError , QueryDRepStateOutput (..) , QueryKesPeriodInfoOutput (..) @@ -21,7 +21,7 @@ import Cardano.Api import Cardano.Api.Ledger qualified as L import Cardano.Api.Shelley -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Prelude diff --git a/cardano-cli/src/Cardano/CLI/Types/TxFeature.hs b/cardano-cli/src/Cardano/CLI/Type/TxFeature.hs similarity index 98% rename from cardano-cli/src/Cardano/CLI/Types/TxFeature.hs rename to cardano-cli/src/Cardano/CLI/Type/TxFeature.hs index e8033c4654..7c05f2331a 100644 --- a/cardano-cli/src/Cardano/CLI/Types/TxFeature.hs +++ b/cardano-cli/src/Cardano/CLI/Type/TxFeature.hs @@ -1,6 +1,6 @@ {-# LANGUAGE LambdaCase #-} -module Cardano.CLI.Types.TxFeature +module Cardano.CLI.Type.TxFeature ( TxFeature (..) , renderFeature ) diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/SigningKeys.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/SigningKeys.hs index c9d7b82985..f59154e160 100644 --- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/SigningKeys.hs +++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/SigningKeys.hs @@ -16,7 +16,7 @@ import Cardano.Api.Byron import Cardano.CLI.Byron.Key (readByronSigningKey) import Cardano.CLI.Byron.Legacy (decodeLegacyDelegateKey) -import Cardano.CLI.Types.Common +import Cardano.CLI.Type.Common import Cardano.Crypto.Signing qualified as Crypto import Codec.CBOR.Read (deserialiseFromBytes) diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/VerifyPoll.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/VerifyPoll.hs index 0a62029cde..beab772245 100644 --- a/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/VerifyPoll.hs +++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/VerifyPoll.hs @@ -5,7 +5,7 @@ module Test.Golden.EraBased.Governance.VerifyPoll where import Cardano.Api -import Cardano.CLI.Types.Key +import Cardano.CLI.Type.Key ( VerificationKeyOrFile (..) , readVerificationKeyOrTextEnvFile ) diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/ErrorsSpec.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/ErrorsSpec.hs index 43d6cce034..6711eaea05 100644 --- a/cardano-cli/test/cardano-cli-golden/Test/Golden/ErrorsSpec.hs +++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/ErrorsSpec.hs @@ -15,17 +15,17 @@ import Cardano.Api import Cardano.Api.Shelley import Cardano.Binary -import Cardano.CLI.EraBased.Run.Governance.Actions -import Cardano.CLI.EraBased.Run.Governance.Committee -import Cardano.CLI.EraBased.Script.Types +import Cardano.CLI.EraBased.Governance.Actions.Run +import Cardano.CLI.EraBased.Governance.Committee.Run +import Cardano.CLI.EraBased.Script.Type import Cardano.CLI.Read -import Cardano.CLI.Types.Errors.DelegationError -import Cardano.CLI.Types.Errors.GovernanceCmdError -import Cardano.CLI.Types.Errors.GovernanceVoteCmdError -import Cardano.CLI.Types.Errors.RegistrationError -import Cardano.CLI.Types.Errors.StakeAddressCmdError -import Cardano.CLI.Types.Errors.StakeAddressRegistrationError -import Cardano.CLI.Types.Errors.StakeCredentialError +import Cardano.CLI.Type.Error.DelegationError +import Cardano.CLI.Type.Error.GovernanceCmdError +import Cardano.CLI.Type.Error.GovernanceVoteCmdError +import Cardano.CLI.Type.Error.RegistrationError +import Cardano.CLI.Type.Error.StakeAddressCmdError +import Cardano.CLI.Type.Error.StakeAddressRegistrationError +import Cardano.CLI.Type.Error.StakeCredentialError import Data.Text.Encoding.Error import GHC.Stack (HasCallStack) @@ -36,7 +36,7 @@ import Test.Tasty test_GovernanceCmdError :: TestTree test_GovernanceCmdError = testErrorMessagesRendering - "Cardano.CLI.Types.Errors.GovernanceCmdError" + "Cardano.CLI.Type.Error.GovernanceCmdError" "GovernanceCmdError" [ ( "StakeCredGovCmdError" @@ -140,7 +140,7 @@ test_GovernanceCmdError = test_DelegationError :: TestTree test_DelegationError = testErrorMessagesRendering - "Cardano.CLI.Types.Errors.CmdError" + "Cardano.CLI.Type.Error.CmdError" "DelegationError" [ ( "DelegationReadError" @@ -181,7 +181,7 @@ test_DelegationError = test_RegistrationError :: TestTree test_RegistrationError = testErrorMessagesRendering - "Cardano.CLI.Types.Errors.CmdError" + "Cardano.CLI.Type.Error.CmdError" "RegistrationError" [ ( "RegistrationReadError" @@ -220,7 +220,7 @@ test_RegistrationError = test_VoteReadError :: TestTree test_VoteReadError = testErrorMessagesRendering - "Cardano.CLI.Types.Errors.GovernanceVoteCmdError" + "Cardano.CLI.Type.Error.GovernanceVoteCmdError" "GovernanceVoteCmdError" [ ( "GovernanceVoteCmdCredentialDecodeError" @@ -247,7 +247,7 @@ test_VoteReadError = test_GovernanceComitteeError :: TestTree test_GovernanceComitteeError = testErrorMessagesRendering - "Cardano.CLI.EraBased.Run.Governance.Committee" + "Cardano.CLI.EraBased.Governance.Committee.Run" "GovernanceCommitteeError" [ ( "GovernanceCommitteeCmdWriteFileError" @@ -264,7 +264,7 @@ test_GovernanceComitteeError = test_GovernanceActionsError :: TestTree test_GovernanceActionsError = testErrorMessagesRendering - "Cardano.CLI.EraBased.Run.Governance.Actions" + "Cardano.CLI.EraBased.Governance.Actions.Run" "GovernanceActionsError" [ ( "GovernanceActionsCmdWriteFileError" diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/AddCostModels.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/AddCostModels.hs index 074c446a03..da4af92759 100644 --- a/cardano-cli/test/cardano-cli-test/Test/Cli/AddCostModels.hs +++ b/cardano-cli/test/cardano-cli-test/Test/Cli/AddCostModels.hs @@ -7,7 +7,7 @@ import Cardano.Api.Internal.ProtocolParameters import Cardano.Api.Ledger (StrictMaybe (..)) import Cardano.Api.Ledger qualified as L -import Cardano.CLI.EraBased.Run.Governance.Actions +import Cardano.CLI.EraBased.Governance.Actions.Run import Test.Gen.Cardano.Api.ProtocolParameters import Test.Gen.Cardano.Api.Typed diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/ITN.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/ITN.hs index acf58d3caa..16e8639102 100644 --- a/cardano-cli/test/cardano-cli-test/Test/Cli/ITN.hs +++ b/cardano-cli/test/cardano-cli-test/Test/Cli/ITN.hs @@ -8,7 +8,7 @@ module Test.Cli.ITN ) where -import Cardano.CLI.Run.Key (decodeBech32) +import Cardano.CLI.EraIndependent.Key.Run (decodeBech32) import Codec.Binary.Bech32 qualified as Bech32 import Control.Monad (void) diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Json.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Json.hs index 21041f9f8d..9d34022e9a 100644 --- a/cardano-cli/test/cardano-cli-test/Test/Cli/Json.hs +++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Json.hs @@ -8,8 +8,8 @@ where import Cardano.Api.Shelley -import Cardano.CLI.Types.Common -import Cardano.CLI.Types.Output (QueryKesPeriodInfoOutput (..), createOpCertIntervalInfo) +import Cardano.CLI.Type.Common +import Cardano.CLI.Type.Output (QueryKesPeriodInfoOutput (..), createOpCertIntervalInfo) import Data.Aeson import Data.Time diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/MonadWarning.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/MonadWarning.hs index 424b329f2f..f5a0f1c25c 100644 --- a/cardano-cli/test/cardano-cli-test/Test/Cli/MonadWarning.hs +++ b/cardano-cli/test/cardano-cli-test/Test/Cli/MonadWarning.hs @@ -3,7 +3,7 @@ module Test.Cli.MonadWarning ) where -import Cardano.CLI.Types.MonadWarning (MonadWarning, reportIssue, runWarningStateT) +import Cardano.CLI.Type.MonadWarning (MonadWarning, reportIssue, runWarningStateT) import Control.Monad (when) import Control.Monad.Trans.State (State, runState) diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Parser.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Parser.hs index aca53d0c98..7328fb8552 100644 --- a/cardano-cli/test/cardano-cli-test/Test/Cli/Parser.hs +++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Parser.hs @@ -9,7 +9,7 @@ module Test.Cli.Parser ) where -import Cardano.CLI.EraBased.Options.Common +import Cardano.CLI.EraBased.Common.Option ( integralParsecParser , pairIntegralParsecParser ) diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Query.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Query.hs index e67920093e..02159fb95f 100644 --- a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Query.hs +++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Query.hs @@ -3,7 +3,7 @@ module Test.Cli.Shelley.Run.Query ) where -import Cardano.CLI.EraBased.Run.Query qualified as Q +import Cardano.CLI.EraBased.Query.Run qualified as Q import Cardano.Slotting.Time (RelativeTime (..)) import Hedgehog (Property, (===))