Skip to content

Commit

Permalink
Merge pull request #4951 from input-output-hk/jordan/remove-protolude…
Browse files Browse the repository at this point in the history
…-cardano-submit-api

Remove protolude from cardano-submit-api
  • Loading branch information
angerman authored Mar 8, 2023
2 parents 2120fac + 4f0678a commit 9a24ace
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion cardano-submit-api/cardano-submit-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ library
, ouroboros-consensus-cardano
, ouroboros-network
, prometheus
, protolude
, servant
, servant-server
, streaming-commons
Expand Down
6 changes: 2 additions & 4 deletions cardano-submit-api/src/Cardano/TxSubmit/Config.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ import Data.Aeson (FromJSON (..), Object, Value (..), (.:))
import Data.Aeson.Types (Parser)
import Data.Bool (bool)
import Data.ByteString (ByteString)
import Protolude.Panic (panic)

import qualified Cardano.BM.Configuration as Logging
import qualified Cardano.BM.Configuration.Model as Logging
import qualified Cardano.BM.Data.Configuration as Logging
import qualified Data.Aeson as Aeson
import qualified Data.ByteString.Char8 as B8
import qualified Data.Text as T
import qualified Data.Yaml as Yaml

type TxSubmitNodeConfig = GenTxSubmitNodeConfig Logging.Configuration
Expand All @@ -43,13 +41,13 @@ readTxSubmitNodeConfig :: FilePath -> IO TxSubmitNodeConfig
readTxSubmitNodeConfig fp = do
res <- Yaml.decodeEither' <$> readLoggingConfig
case res of
Left err -> panic $ "readTxSubmitNodeConfig: Error parsing config: " <> textShow err
Left err -> error $ "readTxSubmitNodeConfig: Error parsing config: " <> Yaml.prettyPrintParseException err
Right icr -> convertLogging icr
where
readLoggingConfig :: IO ByteString
readLoggingConfig =
catch (B8.readFile fp) $ \(_ :: IOException) ->
panic $ "Cannot find the logging configuration file at : " <> T.pack fp
error $ "Cannot find the logging configuration file at : " <> fp

convertLogging :: GenTxSubmitNodeConfig Logging.Representation -> IO TxSubmitNodeConfig
convertLogging tsc = do
Expand Down

0 comments on commit 9a24ace

Please sign in to comment.