Remove writeFileTextEnvelopeWithOwnerPermissions. Use writeLazyByteStringFileWithOwnerPermissions and textEnvelopeToJSON instead

Author: newhoggy

cardano-api/src/Cardano/Api.hs

@@ -538,7 +538,6 @@ module Cardano.Api (
     deserialiseFromTextEnvelope,
     readFileTextEnvelope,
     writeFileTextEnvelope,
-    writeFileTextEnvelopeWithOwnerPermissions,
     readTextEnvelopeFromFile,
     readTextEnvelopeOfTypeFromFile,
 

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"

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

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 ()