Merge pull request #119 from input-output-hk/newhoggy/rename-Cardano.…

…CLI.Run.EraBased Move more era-based code to under `Cardano.CLI.EraBased` module
IntersectMBO · Aug 5, 2023 · 2f36a1e · 2f36a1e
2 parents aebdcce + 00fe0fa
commit 2f36a1e
Show file tree

Hide file tree

Showing 14 changed files with 289 additions and 369 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -62,18 +62,19 @@ library
                         Cardano.CLI.Byron.Tx
                         Cardano.CLI.Byron.UpdateProposal
                         Cardano.CLI.Byron.Vote
-                        Cardano.CLI.Commands.EraBased
                         Cardano.CLI.Commands.Governance
                         Cardano.CLI.Commands.Legacy
                         Cardano.CLI.Environment
-                        Cardano.CLI.EraBased.Certificate
+                        Cardano.CLI.EraBased.Commands
                         Cardano.CLI.EraBased.Commands.Governance
                         Cardano.CLI.EraBased.Commands.Governance.Committee
                         Cardano.CLI.EraBased.Governance
                         Cardano.CLI.EraBased.Legacy
                         Cardano.CLI.EraBased.Options.Common
                         Cardano.CLI.EraBased.Options.Governance
                         Cardano.CLI.EraBased.Options.Governance.Committee
+                        Cardano.CLI.EraBased.Run
+                        Cardano.CLI.EraBased.Run.Certificate
                         Cardano.CLI.EraBased.Run.Governance
                         Cardano.CLI.EraBased.Run.Governance.Committee
                         Cardano.CLI.EraBased.Vote
@@ -86,12 +87,10 @@ library
                         Cardano.CLI.Pretty
                         Cardano.CLI.Render
                         Cardano.CLI.Run
-                        Cardano.CLI.Run.EraBased
                         Cardano.CLI.Run.Legacy
                         Cardano.CLI.Run.Legacy.Address
                         Cardano.CLI.Run.Legacy.Address.Info
                         Cardano.CLI.Run.Legacy.Genesis
-                        Cardano.CLI.Run.Legacy.Governance
                         Cardano.CLI.Run.Legacy.Key
                         Cardano.CLI.Run.Legacy.Node
                         Cardano.CLI.Run.Legacy.Pool

diff --git a/cardano-cli/src/Cardano/CLI/Commands/Governance.hs b/cardano-cli/src/Cardano/CLI/Commands/Governance.hs
@@ -59,8 +59,8 @@ data GovernanceCmdError
   | GovernanceCmdVerifyPollError !GovernancePollError
   | GovernanceCmdWriteFileError !(FileError ())
   -- Legacy - remove me after cardano-cli transitions to new era based structure
-  | ShelleyGovernanceCmdMIRCertNotSupportedInConway
-  | ShelleyGovernanceCmdGenesisDelegationNotSupportedInConway
+  | GovernanceCmdMIRCertNotSupportedInConway
+  | GovernanceCmdGenesisDelegationNotSupportedInConway
   deriving Show
 
 instance Error GovernanceCmdError where
@@ -109,9 +109,9 @@ instance Error GovernanceCmdError where
       toS (renderGovernancePollError pollError)
     GovernanceCmdWriteFileError fileError ->
       "Cannot write file: " <> displayError fileError
-    ShelleyGovernanceCmdMIRCertNotSupportedInConway ->
+    GovernanceCmdMIRCertNotSupportedInConway ->
       "MIR certificates are not supported in Conway era onwards."
-    ShelleyGovernanceCmdGenesisDelegationNotSupportedInConway ->
+    GovernanceCmdGenesisDelegationNotSupportedInConway ->
       "Genesis delegation is not supported in Conway era onwards."
     where
       renderDecoderError = toS . TL.toLazyText . B.build

diff --git a/...-cli/src/Cardano/CLI/Commands/EraBased.hs → ...-cli/src/Cardano/CLI/EraBased/Commands.hs b/...-cli/src/Cardano/CLI/Commands/EraBased.hs → ...-cli/src/Cardano/CLI/EraBased/Commands.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 
-module Cardano.CLI.Commands.EraBased
+module Cardano.CLI.EraBased.Commands
   ( EraBasedCommand (..)
   , AnyEraCommand (..)
   , renderEraBasedCommand

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs
@@ -28,6 +28,7 @@ import           Data.String
 import           Options.Applicative
 import qualified Options.Applicative as Opt
 
+-- TODO: Conway era - move to Cardano.CLI.Conway.Parsers
 pEraBasedGovernanceCmd :: EnvCli -> CardanoEra era -> Parser (EraBasedGovernanceCmd era)
 pEraBasedGovernanceCmd envCli era =
   asum $ catMaybes

diff --git a/cardano-cli/src/Cardano/CLI/Run/EraBased.hs → cardano-cli/src/Cardano/CLI/EraBased/Run.hs b/cardano-cli/src/Cardano/CLI/Run/EraBased.hs → cardano-cli/src/Cardano/CLI/EraBased/Run.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 
-module Cardano.CLI.Run.EraBased
+module Cardano.CLI.EraBased.Run
   ( AnyEraCmdError(..)
   , runAnyEraCommand
   , runEraBasedCommand
@@ -12,9 +12,9 @@ module Cardano.CLI.Run.EraBased
 
 import           Cardano.Api
 
-import           Cardano.CLI.Commands.EraBased
-import           Cardano.CLI.EraBased.Certificate
+import           Cardano.CLI.EraBased.Commands
 import           Cardano.CLI.EraBased.Options.Governance
+import           Cardano.CLI.EraBased.Run.Certificate
 import           Cardano.CLI.EraBased.Run.Governance
 import           Cardano.CLI.EraBased.Run.Governance.Committee
 import           Cardano.CLI.EraBased.Vote
@@ -59,8 +59,8 @@ runEraBasedGovernanceCmd = \case
       $ runGovernanceMIRCertificateTransfer w ll oFp direction
 
   EraBasedGovernanceDelegationCertificateCmd stakeIdentifier delegationTarget outFp ->
-    firstExceptT (const ()) -- TODO: Conway era - fix error handling
-      $ runGovernanceDelegrationCertificate stakeIdentifier delegationTarget outFp
+    firstExceptT (const ()) -- TODO fix error handling
+      $ runGovernanceDelegationCertificate stakeIdentifier delegationTarget outFp
 
   EraBasedGovernanceRegistrationCertificateCmd regTarget outFp ->
     firstExceptT (const ()) -- TODO: Conway era - fix error handling

diff --git a/...i/src/Cardano/CLI/EraBased/Certificate.hs → ...c/Cardano/CLI/EraBased/Run/Certificate.hs b/...i/src/Cardano/CLI/EraBased/Certificate.hs → ...c/Cardano/CLI/EraBased/Run/Certificate.hs
@@ -4,12 +4,12 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 
-module Cardano.CLI.EraBased.Certificate
+module Cardano.CLI.EraBased.Run.Certificate
   ( EraBasedDelegationError(..)
-  , runGovernanceDelegrationCertificate
-
   , EraBasedRegistrationError(..)
+
   , runGovernanceRegistrationCertificate
+  , runGovernanceDelegationCertificate
   ) where
 
 import           Cardano.Api
@@ -34,12 +34,12 @@ data EraBasedDelegationError
   | EraBasedDRepReadError !(FileError InputDecodeError)
   | EraBasedDelegationGenericError -- TODO Delete and replace with more specific errors
 
-runGovernanceDelegrationCertificate
+runGovernanceDelegationCertificate
   :: StakeIdentifier
   -> AnyDelegationTarget
   -> File () Out
   -> ExceptT EraBasedDelegationError IO ()
-runGovernanceDelegrationCertificate stakeIdentifier delegationTarget outFp = do
+runGovernanceDelegationCertificate stakeIdentifier delegationTarget outFp = do
   stakeCred <-
     getStakeCredentialFromIdentifier stakeIdentifier
       & firstExceptT EraBasedCredentialError