Move readConfigFile to new Hydra.Cluster.Util module

hydra-cluster/hydra-cluster.cabal

@@ -116,6 +116,7 @@ library
     CardanoClient
     CardanoCluster
     CardanoNode
+    Hydra.Cluster.Util
     Hydra.Generator
     Hydra.LogFilter
     HydraNode

hydra-cluster/src/CardanoCluster.hs

@@ -44,6 +44,7 @@ import qualified Data.Aeson as Aeson
 import qualified Data.ByteString as BS
 import Hydra.Chain.Direct.Util (markerDatumHash, retry)
 import qualified Hydra.Chain.Direct.Util as Cardano
+import Hydra.Cluster.Util (readConfigFile)
 import Hydra.Options (
   ChainConfig (..),
   defaultChainConfig,
@@ -317,13 +318,6 @@ newNodeConfig stateDirectory = do
       , systemStart
       , ports = PortsConfig nodePort []
       }
-
--- | Lookup a config file similar reading a file from disk.
-readConfigFile :: FilePath -> IO ByteString
-readConfigFile source = do
-  filename <- Pkg.getDataFileName ("config" </> source)
-  BS.readFile filename
-
 --
 -- Logging
 --

hydra-cluster/src/CardanoNode.hs

@@ -18,6 +18,7 @@ import qualified Data.HashMap.Strict as HM
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime, utcTimeToPOSIXSeconds)
 import Hydra.Cardano.Api (AsType (AsPaymentKey), PaymentKey, SigningKey, VerificationKey, generateSigningKey, getVerificationKey)
 import System.Directory (doesFileExist, removeFile)
+import Hydra.Cluster.Util (readConfigFile)
 import System.Exit (ExitCode (..))
 import System.FilePath ((<.>), (</>))
 import System.Process (

hydra-cluster/src/Hydra/Cluster/Util.hs

@@ -0,0 +1,14 @@
+-- | Utilities used across hydra-cluster
+module Hydra.Cluster.Util where
+
+import Hydra.Prelude
+
+import qualified Data.ByteString as BS
+import qualified Paths_hydra_cluster as Pkg
+import System.FilePath ((</>))
+
+-- | Lookup a config file similar reading a file from disk.
+readConfigFile :: FilePath -> IO ByteString
+readConfigFile source = do
+  filename <- Pkg.getDataFileName ("config" </> source)
+  BS.readFile filename

hydra-cluster/src/HydraNode.hs

@@ -25,8 +25,10 @@ import Hydra.Cardano.Api
 import Hydra.Prelude hiding (delete)
 
 import Cardano.BM.Tracing (ToObject)
-import CardanoCluster (ClusterLog, readConfigFile)
-import Control.Concurrent.Async (forConcurrently_)
+import CardanoCluster (ClusterLog)
+import Control.Concurrent.Async (
+  forConcurrently_,
+ )
 import Control.Exception (IOException)
 import Control.Monad.Class.MonadSTM (modifyTVar', newTVarIO, readTVarIO)
 import Data.Aeson (Value (String), object, (.=))
@@ -35,6 +37,7 @@ import Data.Aeson.Types (Pair)
 import qualified Data.ByteString as BS
 import qualified Data.List as List
 import qualified Data.Text as T
+import Hydra.Cluster.Util (readConfigFile)
 import Hydra.Crypto (deriveVerificationKey, serialiseSigningKeyToRawBytes, serialiseVerificationKeyToRawBytes)
 import qualified Hydra.Crypto as Hydra
 import Hydra.Logging (Tracer, traceWith)

hydra-cluster/test/Test/Ledger/Cardano/ConfigurationSpec.hs

@@ -3,9 +3,9 @@ module Test.Ledger.Cardano.ConfigurationSpec where
 import Hydra.Prelude
 import Test.Hydra.Prelude
 
-import CardanoCluster (readConfigFile)
 import qualified Data.Aeson as Json
 import qualified Data.Aeson.Types as Json
+import Hydra.Cluster.Util (readConfigFile)
 import Hydra.Ledger.Cardano.Configuration (
   protocolParametersFromJson,
   shelleyGenesisFromJson,