Consistent UTF-8 consle settings for cardano-node incl. test suite + cardano-tracer

Author: mgmeier

cardano-node/app/cardano-node.hs

@@ -17,15 +17,17 @@ import           Data.Monoid (Last (getLast))
 import qualified Data.Text as Text
 import qualified Data.Text.IO as Text
 import           Data.Version (showVersion)
+import           Main.Utf8 (withUtf8)
 import           Options.Applicative
 import qualified Options.Applicative as Opt
 import           System.Info (arch, compilerName, compilerVersion, os)
 import           System.IO (hPutStrLn, stderr)
+import           System.IO.CodePage (withCP65001)
 
 import           Paths_cardano_node (version)
 
 main :: IO ()
-main = do
+main = withCP65001 $ withUtf8 $ do
   Crypto.cryptoInit
 
   toplevelExceptionHandler $ do

cardano-node/cardano-node.cabal

@@ -220,7 +220,9 @@ executable cardano-node
                       , cardano-crypto-class
                       , cardano-git-rev
                       , cardano-node
+                      , code-page
                       , optparse-applicative
+                      , with-utf8
                       , text
 
 test-suite cardano-node-test
@@ -240,6 +242,7 @@ test-suite cardano-node-test
                       , cardano-diffusion:{api, cardano-diffusion, orphan-instances}
                       , cardano-node
                       , cardano-slotting
+                      , code-page
                       , containers
                       , contra-tracer
                       , directory
@@ -256,6 +259,7 @@ test-suite cardano-node-test
                       , trace-dispatcher
                       , transformers
                       , vector
+                      , with-utf8
                       , yaml
 
   other-modules:        Test.Cardano.Config.Mainnet

cardano-node/test/cardano-node-test.hs

@@ -5,7 +5,9 @@
 #endif
 
 import           Hedgehog.Main (defaultMain)
-import           System.IO (BufferMode (LineBuffering), hSetBuffering, hSetEncoding, stdout, utf8)
+import           Main.Utf8 (withUtf8)
+import           System.IO (BufferMode (LineBuffering), hSetBuffering, stdout)
+import           System.IO.CodePage (withCP65001)
 
 import qualified Test.Cardano.Config.Mainnet
 #ifdef UNIX
@@ -20,11 +22,10 @@ import qualified Test.Cardano.Tracing.NewTracing.Consistency
 import qualified Cardano.Crypto.Init as Crypto
 
 main :: IO ()
-main = do
+main = withCP65001 $ withUtf8 $ do
   Crypto.cryptoInit
 
   hSetBuffering stdout LineBuffering
-  hSetEncoding stdout utf8
   runTests
   where
     runTests = defaultMain $

cardano-tracer/app/cardano-tracer.hs

@@ -2,12 +2,14 @@ import           Cardano.Tracer.CLI (TracerParams, parseTracerParams)
 import           Cardano.Tracer.Run (runCardanoTracer)
 
 import           Data.Version (showVersion)
+import           Main.Utf8 (withUtf8)
 import           Options.Applicative
+import           System.IO.CodePage (withCP65001)
 
 import           Paths_cardano_tracer (version)
 
 main :: IO ()
-main =
+main = withCP65001 $ withUtf8 $
   runCardanoTracer =<< customExecParser (prefs showHelpOnEmpty) tracerInfo
 
 tracerInfo :: ParserInfo TracerParams

cardano-tracer/cardano-tracer.cabal

@@ -163,7 +163,9 @@ executable cardano-tracer
                       , ScopedTypeVariables
 
   build-depends:        cardano-tracer
+                      , code-page
                       , optparse-applicative
+                      , with-utf8
 
   ghc-options:          -threaded
                         -rtsopts