diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index a8c4ef05d93..e214e00d197 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -538,7 +538,6 @@ module Cardano.Api ( deserialiseFromTextEnvelope, readFileTextEnvelope, writeFileTextEnvelope, - writeFileTextEnvelopeWithOwnerPermissions, readTextEnvelopeFromFile, readTextEnvelopeOfTypeFromFile, diff --git a/cardano-api/src/Cardano/Api/SerialiseTextEnvelope.hs b/cardano-api/src/Cardano/Api/SerialiseTextEnvelope.hs index 831d31ca116..8d7cda7db8f 100644 --- a/cardano-api/src/Cardano/Api/SerialiseTextEnvelope.hs +++ b/cardano-api/src/Cardano/Api/SerialiseTextEnvelope.hs @@ -18,7 +18,6 @@ module Cardano.Api.SerialiseTextEnvelope , deserialiseFromTextEnvelope , readFileTextEnvelope , writeFileTextEnvelope - , writeFileTextEnvelopeWithOwnerPermissions , readTextEnvelopeFromFile , readTextEnvelopeOfTypeFromFile , textEnvelopeToJSON @@ -215,17 +214,6 @@ writeFileTextEnvelope :: HasTextEnvelope a writeFileTextEnvelope outputFile mbDescr a = writeLazyByteStringFile outputFile (textEnvelopeToJSON mbDescr a) - -writeFileTextEnvelopeWithOwnerPermissions - :: HasTextEnvelope a - => FilePath - -> Maybe TextEnvelopeDescr - -> a - -> IO (Either (FileError ()) ()) -writeFileTextEnvelopeWithOwnerPermissions targetPath mbDescr a = - writeLazyByteStringFileWithOwnerPermissions targetPath $ textEnvelopeToJSON mbDescr a - - textEnvelopeToJSON :: HasTextEnvelope a => Maybe TextEnvelopeDescr -> a -> LBS.ByteString textEnvelopeToJSON mbDescr a = encodePretty' textEnvelopeJSONConfig (serialiseToTextEnvelope mbDescr a) <> "\n" diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Node.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Node.hs index b146baf2b80..6f6dd53cc80 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Node.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Node.hs @@ -129,7 +129,8 @@ runNodeKeyGenVRF (VerificationKeyFile vkeyPath) (SigningKeyFile skeyPath) = do let vkey = getVerificationKey skey firstExceptT ShelleyNodeCmdWriteFileError . newExceptT - $ writeFileTextEnvelopeWithOwnerPermissions skeyPath (Just skeyDesc) skey + $ writeLazyByteStringFileWithOwnerPermissions skeyPath + $ textEnvelopeToJSON (Just skeyDesc) skey firstExceptT ShelleyNodeCmdWriteFileError . newExceptT $ writeLazyByteStringFile vkeyPath diff --git a/cardano-node/test/Test/Cardano/Node/FilePermissions.hs b/cardano-node/test/Test/Cardano/Node/FilePermissions.hs index b0970712047..e3a282604ef 100644 --- a/cardano-node/test/Test/Cardano/Node/FilePermissions.hs +++ b/cardano-node/test/Test/Cardano/Node/FilePermissions.hs @@ -18,21 +18,21 @@ import System.Directory (removeFile) import Cardano.Api import Cardano.Node.Run (checkVRFFilePermissions) import Control.Exception (bracket) -import Control.Monad (Monad(..)) -import Control.Monad.Except(MonadIO(liftIO), runExceptT ) +import Control.Monad (Monad (..)) +import Control.Monad.Except (MonadIO (liftIO), runExceptT) import Data.Bool (Bool, not) -import Data.Either (Either(..)) +import Data.Either (Either (..)) import Data.Eq ((==)) import Data.Foldable (foldl', length) -import Data.Function (($), (.), const) -import Data.Maybe (Maybe(..)) -import Data.Semigroup (Semigroup(..)) +import Data.Function (const, ($), (.)) import qualified Data.List as L +import Data.Maybe (Maybe (..)) +import Data.Semigroup (Semigroup (..)) import Hedgehog (Property, PropertyT, property, success) import qualified Hedgehog import Hedgehog.Internal.Property (Group (..), failWith) import System.IO (FilePath, IO) -import Text.Show (Show(..)) +import Text.Show (Show (..)) #ifdef UNIX import Cardano.Node.Types (VRFPrivateKeyFilePermissionError (..)) @@ -63,7 +63,7 @@ prop_createVRFFileWithOwnerPermissions = createFileWithOwnerPermissions :: HasTextEnvelope a => FilePath -> a -> PropertyT IO () createFileWithOwnerPermissions targetfp value = do - result <- liftIO $ writeFileTextEnvelopeWithOwnerPermissions targetfp Nothing value + result <- liftIO $ writeLazyByteStringFileWithOwnerPermissions targetfp $ textEnvelopeToJSON Nothing value case result of Left err -> failWith Nothing $ displayError err Right () -> return ()