Skip to content

Remove protolude from cardano-submit-api #4951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2023
Merged

Remove protolude from cardano-submit-api #4951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cardano-submit-api/cardano-submit-api.cabal
View file
Open in desktop
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
View file
Open in desktop
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