Address review comments

Author: Jimbo4350

cardano-cli/src/Cardano/CLI/Compatible/Exception.hs

@@ -10,7 +10,6 @@ module Cardano.CLI.Compatible.Exception
   , fromEitherCli
   , fromEitherIOCli
   , fromExceptTCli
-  , readFileCli
   )
 where
 
@@ -70,6 +69,3 @@ fromExceptTCli
   => ExceptT e IO a
   -> m a
 fromExceptTCli = withFrozenCallStack $ fromEitherIOCli . runExceptT
-
-readFileCli :: (HasCallStack, MonadIO m) => FilePath -> m ByteString
-readFileCli = withFrozenCallStack . readFileBinary

cardano-cli/src/Cardano/CLI/EraBased/Genesis/Run.hs

@@ -56,6 +56,7 @@ import Cardano.CLI.EraIndependent.Node.Run
   , runNodeKeyGenVrfCmd
   )
 import Cardano.CLI.IO.Lazy qualified as Lazy
+import Cardano.CLI.Read
 import Cardano.CLI.Type.Common
 import Cardano.CLI.Type.Error.GenesisCmdError
 import Cardano.CLI.Type.Error.NodeCmdError

cardano-cli/src/Cardano/CLI/EraBased/Governance/GenesisKeyDelegationCertificate/Run.hs

@@ -33,25 +33,14 @@ runGovernanceGenesisKeyDelegationCertificate
   vrfVkOrHashOrFp
   oFp = do
     genesisVkHash <-
-<<<<<<< HEAD
-      modifyError GovernanceCmdKeyReadError $
-        readVerificationKeyOrHashOrTextEnvFile genVkOrHashOrFp
-    genesisDelVkHash <-
-      modifyError GovernanceCmdKeyReadError $
-        readVerificationKeyOrHashOrTextEnvFile genDelVkOrHashOrFp
-    vrfVkHash <-
-      modifyError GovernanceCmdKeyReadError $
-        readVerificationKeyOrHashOrFile vrfVkOrHashOrFp
-=======
       fromExceptTCli $
-        readVerificationKeyOrHashOrTextEnvFile AsGenesisKey genVkOrHashOrFp
+        readVerificationKeyOrHashOrTextEnvFile genVkOrHashOrFp
     genesisDelVkHash <-
       fromExceptTCli $
-        readVerificationKeyOrHashOrTextEnvFile AsGenesisDelegateKey genDelVkOrHashOrFp
+        readVerificationKeyOrHashOrTextEnvFile genDelVkOrHashOrFp
     vrfVkHash <-
       fromExceptTCli $
-        readVerificationKeyOrHashOrFile AsVrfKey vrfVkOrHashOrFp
->>>>>>> 9730c5720 (Convert runGovernanceCmds to use CIO e ())
+        readVerificationKeyOrHashOrFile vrfVkOrHashOrFp
 
     let req = GenesisKeyDelegationRequirements stb genesisVkHash genesisDelVkHash vrfVkHash
         genKeyDelegCert = makeGenesisKeyDelegationCertificate req

cardano-cli/src/Cardano/CLI/Legacy/Governance/Run.hs

@@ -23,6 +23,7 @@ import Cardano.CLI.EraBased.Governance.GenesisKeyDelegationCertificate.Run
 import Cardano.CLI.EraBased.Governance.Run
 import Cardano.CLI.Legacy.Governance.Command
 import Cardano.CLI.Orphan ()
+import Cardano.CLI.Read
 import Cardano.CLI.Type.Common
 import Cardano.CLI.Type.Error.GovernanceCmdError
 

cardano-cli/src/Cardano/CLI/Read.hs

@@ -96,6 +96,7 @@ module Cardano.CLI.Read
 
     -- * Genesis hashes
   , readShelleyOnwardsGenesisAndHash
+  , readFileCli
   )
 where
 
@@ -127,6 +128,7 @@ import Cardano.Crypto.Hash qualified as Crypto
 import Cardano.Ledger.Api qualified as L
 import Cardano.Ledger.Hashes qualified as L
 
+import RIO (readFileBinary)
 import Prelude
 
 import Control.Exception (bracket)
@@ -151,6 +153,7 @@ import Data.Text.Encoding.Error qualified as Text
 import Data.Word
 import GHC.IO.Handle (hClose, hIsSeekable)
 import GHC.IO.Handle.FD (openFileBlocking)
+import GHC.Stack
 import Options.Applicative qualified as Opt
 import System.IO (IOMode (ReadMode))
 
@@ -1059,3 +1062,6 @@ getVerificationKeyFromStakePoolVerificationKeySource = \case
       [ FromSomeType (AsVerificationKey AsStakePoolKey) AnyStakePoolNormalVerificationKey
       , FromSomeType (AsVerificationKey AsStakePoolExtendedKey) AnyStakePoolExtendedVerificationKey
       ]
+
+readFileCli :: (HasCallStack, MonadIO m) => FilePath -> m ByteString
+readFileCli = withFrozenCallStack . readFileBinary