Skip to content

Commit 444bb5b

Browse files
committed
Address review comments
1 parent 97c930c commit 444bb5b

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ module Cardano.CLI.Compatible.Exception
1010
, fromEitherCli
1111
, fromEitherIOCli
1212
, fromExceptTCli
13-
, readFileCli
1413
)
1514
where
1615

@@ -70,6 +69,3 @@ fromExceptTCli
7069
=> ExceptT e IO a
7170
-> m a
7271
fromExceptTCli = withFrozenCallStack $ fromEitherIOCli . runExceptT
73-
74-
readFileCli :: (HasCallStack, MonadIO m) => FilePath -> m ByteString
75-
readFileCli = withFrozenCallStack . readFileBinary

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import Cardano.CLI.EraIndependent.Node.Run
5656
, runNodeKeyGenVrfCmd
5757
)
5858
import Cardano.CLI.IO.Lazy qualified as Lazy
59+
import Cardano.CLI.Read
5960
import Cardano.CLI.Type.Common
6061
import Cardano.CLI.Type.Error.GenesisCmdError
6162
import Cardano.CLI.Type.Error.NodeCmdError

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import Cardano.CLI.EraBased.Governance.GenesisKeyDelegationCertificate.Run
2323
import Cardano.CLI.EraBased.Governance.Run
2424
import Cardano.CLI.Legacy.Governance.Command
2525
import Cardano.CLI.Orphan ()
26+
import Cardano.CLI.Read
2627
import Cardano.CLI.Type.Common
2728
import Cardano.CLI.Type.Error.GovernanceCmdError
2829

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ module Cardano.CLI.Read
9696

9797
-- * Genesis hashes
9898
, readShelleyOnwardsGenesisAndHash
99+
, readFileCli
99100
)
100101
where
101102

@@ -127,6 +128,7 @@ import Cardano.Crypto.Hash qualified as Crypto
127128
import Cardano.Ledger.Api qualified as L
128129
import Cardano.Ledger.Hashes qualified as L
129130

131+
import RIO (readFileBinary)
130132
import Prelude
131133

132134
import Control.Exception (bracket)
@@ -151,6 +153,7 @@ import Data.Text.Encoding.Error qualified as Text
151153
import Data.Word
152154
import GHC.IO.Handle (hClose, hIsSeekable)
153155
import GHC.IO.Handle.FD (openFileBlocking)
156+
import GHC.Stack
154157
import Options.Applicative qualified as Opt
155158
import System.IO (IOMode (ReadMode))
156159

@@ -1061,3 +1064,6 @@ getVerificationKeyFromStakePoolVerificationKeySource = \case
10611064
[ FromSomeType (AsVerificationKey AsStakePoolKey) AnyStakePoolNormalVerificationKey
10621065
, FromSomeType (AsVerificationKey AsStakePoolExtendedKey) AnyStakePoolExtendedVerificationKey
10631066
]
1067+
1068+
readFileCli :: (HasCallStack, MonadIO m) => FilePath -> m ByteString
1069+
readFileCli = withFrozenCallStack . readFileBinary

0 commit comments

Comments
 (0)