Replace HasFileMode typeclass with plain functions

cardano-api/src/Cardano/Api.hs

@@ -37,10 +37,12 @@ module Cardano.Api (
     -- ** IO
     File(..),
     MapFile(..),
-    HasFileMode(..),
     Directory(..),
     FileDirection(..),
 
+    toFileIn,
+    toFileOut,
+
     writeByteStringFileWithOwnerPermissions,
     writeByteStringFile,
     writeByteStringOutput,
@@ -808,6 +810,13 @@ module Cardano.Api (
     parseFilePath,
     parseFileOut,
     parseDirectory,
+
+    toGenesisFileIn,
+    toGenesisFileOut,
+    toNetworkConfigFileIn,
+    toNetworkConfigFileOut,
+    toNodeConfigIn,
+    toNodeConfigOut,
   ) where
 
 import           Cardano.Api.Address

cardano-api/src/Cardano/Api/IO.hs

@@ -22,9 +22,11 @@ module Cardano.Api.IO
 
   , File(..)
   , MapFile(..)
-  , HasFileMode(..)
   , Directory(..)
   , FileDirection(..)
+
+  , toFileIn
+  , toFileOut
   ) where
 
 #if !defined(mingw32_HOST_OS)
@@ -52,14 +54,14 @@ import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Char8 as BSC
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.ByteString.Lazy as LBSC
-import           Data.Kind (Type)
 import           Data.String (IsString)
 import           Data.Text (Text)
 import qualified Data.Text.IO as Text
 import qualified System.IO as IO
 import           System.IO (Handle)
 
 import           Cardano.Api.Error (FileError (..))
+import           Data.Coerce (coerce)
 
 data FileDirection
   = In
@@ -184,13 +186,8 @@ class MapFile a where
 instance MapFile (File direction) where
   mapFile f = File . f . unFile
 
-class HasFileMode (f :: FileDirection -> Type) where
-  usingIn :: f 'InOut -> f 'In
-  usingOut :: f 'InOut -> f 'Out
-
-instance HasFileMode File where
-  usingIn :: File 'InOut -> File 'In
-  usingIn = File . unFile
+toFileIn :: File 'InOut -> File 'In
+toFileIn = coerce
 
-  usingOut :: File 'InOut -> File 'Out
-  usingOut = File . unFile
+toFileOut :: File 'InOut -> File 'Out
+toFileOut = coerce

cardano-api/src/Cardano/Api/LedgerState.hs

@@ -54,6 +54,13 @@ module Cardano.Api.LedgerState
   , constructGlobals
   , currentEpochEligibleLeadershipSlots
   , nextEpochEligibleLeadershipSlots
+
+  , toGenesisFileIn
+  , toGenesisFileOut
+  , toNetworkConfigFileIn
+  , toNetworkConfigFileOut
+  , toNodeConfigIn
+  , toNodeConfigOut
   )
   where
 
@@ -74,7 +81,9 @@ import qualified Data.ByteString as BS
 import qualified Data.ByteString.Base16 as Base16
 import qualified Data.ByteString.Lazy as LB
 import           Data.ByteString.Short as BSS
+import           Data.Coerce (coerce)
 import           Data.Foldable
+import           Data.Function ((&))
 import           Data.IORef
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
@@ -86,6 +95,7 @@ import           Data.Set (Set)
 import qualified Data.Set as Set
 import           Data.Sharing (FromSharedCBOR, Interns, Share)
 import           Data.SOP.Strict (K (..), NP (..), fn, (:.:) (Comp))
+import           Data.String (IsString)
 import           Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text
@@ -102,7 +112,7 @@ import           Cardano.Api.Block
 import           Cardano.Api.Certificate
 import           Cardano.Api.Eras
 import           Cardano.Api.Error
-import           Cardano.Api.IO (File (..), FileDirection (..), HasFileMode, MapFile (..))
+import           Cardano.Api.IO (File (..), FileDirection (..), MapFile (..))
 import           Cardano.Api.IPC (ConsensusModeParams (..),
                    LocalChainSyncClient (LocalChainSyncClientPipelined),
                    LocalNodeClientProtocols (..), LocalNodeClientProtocolsInMode,
@@ -149,8 +159,6 @@ import           Cardano.Slotting.EpochInfo (EpochInfo)
 import qualified Cardano.Slotting.EpochInfo.API as Slot
 import           Cardano.Slotting.Slot (WithOrigin (At, Origin))
 import qualified Cardano.Slotting.Slot as Slot
-import           Data.Function ((&))
-import           Data.String (IsString)
 import qualified Ouroboros.Consensus.Block.Abstract as Consensus
 import qualified Ouroboros.Consensus.Byron.Ledger.Block as Byron
 import qualified Ouroboros.Consensus.Byron.Ledger.Ledger as Byron
@@ -792,6 +800,12 @@ data NodeConfig (direction :: FileDirection) = NodeConfig
   , ncBabbageToConway  :: !Consensus.TriggerHardFork
   }
 
+toNodeConfigIn :: NodeConfig 'InOut -> NodeConfig 'In
+toNodeConfigIn = coerce
+
+toNodeConfigOut :: NodeConfig 'InOut -> NodeConfig 'Out
+toNodeConfigOut = coerce
+
 instance FromJSON (NodeConfig direction) where
   parseJSON =
       Aeson.withObject "NodeConfig" parse
@@ -973,7 +987,13 @@ data ShelleyConfig = ShelleyConfig
 
 newtype GenesisFile (direction :: FileDirection) = GenesisFile
   { unGenesisFile :: File direction
-  } deriving newtype (Eq, Ord, Show, IsString, HasFileMode, MapFile, FromJSON, ToJSON)
+  } deriving newtype (Eq, Ord, Show, IsString, MapFile, FromJSON, ToJSON)
+
+toGenesisFileIn :: GenesisFile 'InOut -> GenesisFile 'In
+toGenesisFileIn = coerce
+
+toGenesisFileOut :: GenesisFile 'InOut -> GenesisFile 'Out
+toGenesisFileOut = coerce
 
 newtype GenesisHashByron = GenesisHashByron
   { unGenesisHashByron :: Text
@@ -1001,7 +1021,13 @@ newtype NetworkName = NetworkName
 
 newtype NetworkConfigFile (direction :: FileDirection) = NetworkConfigFile
   { _unNetworkConfigFile :: File direction
-  } deriving newtype (Eq, Ord, Show, IsString, HasFileMode, MapFile, FromJSON, ToJSON)
+  } deriving newtype (Eq, Ord, Show, IsString, MapFile, FromJSON, ToJSON)
+
+toNetworkConfigFileIn :: NetworkConfigFile 'InOut -> NetworkConfigFile 'In
+toNetworkConfigFileIn = coerce
+
+toNetworkConfigFileOut :: NetworkConfigFile 'InOut -> NetworkConfigFile 'Out
+toNetworkConfigFileOut = coerce
 
 newtype SocketPath = SocketPath
   { unSocketPath :: FilePath

cardano-cli/src/Cardano/CLI/Byron/Key.hs

@@ -14,6 +14,11 @@ module Cardano.CLI.Byron.Key
   , readPaymentVerificationKey
   , renderByronKeyFailure
   , byronWitnessToVerKey
+
+  , toNewVerificationKeyFileIn
+  , toNewVerificationKeyFileOut
+  , toNewSigningKeyFileIn
+  , toNewSigningKeyFileOut
   )
 where
 
@@ -23,6 +28,7 @@ import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT
                    right)
 import qualified Data.ByteString as SB
 import qualified Data.ByteString.UTF8 as UTF8
+import           Data.Coerce (coerce)
 import           Data.String (IsString, fromString)
 import           Data.Text (Text)
 import qualified Data.Text as T
@@ -63,11 +69,23 @@ renderByronKeyFailure err =
 
 newtype NewSigningKeyFile (direction :: FileDirection) = NewSigningKeyFile
   { unNewSigningKeyFile :: File direction
-  } deriving newtype (Eq, Ord, Show, IsString, HasFileMode, MapFile, FromJSON, ToJSON)
+  } deriving newtype (Eq, Ord, Show, IsString, MapFile, FromJSON, ToJSON)
+
+toNewSigningKeyFileIn :: NewSigningKeyFile 'InOut -> NewSigningKeyFile 'In
+toNewSigningKeyFileIn = coerce
+
+toNewSigningKeyFileOut :: NewSigningKeyFile 'InOut -> NewSigningKeyFile 'Out
+toNewSigningKeyFileOut = coerce
 
 newtype NewVerificationKeyFile (direction :: FileDirection) = NewVerificationKeyFile
   { unNewVerificationKeyFile :: File direction
-  } deriving newtype (Eq, Ord, Show, IsString, HasFileMode, MapFile, FromJSON, ToJSON)
+  } deriving newtype (Eq, Ord, Show, IsString, MapFile, FromJSON, ToJSON)
+
+toNewVerificationKeyFileIn :: NewVerificationKeyFile 'InOut -> NewVerificationKeyFile 'In
+toNewVerificationKeyFileIn = coerce
+
+toNewVerificationKeyFileOut :: NewVerificationKeyFile 'InOut -> NewVerificationKeyFile 'Out
+toNewVerificationKeyFileOut = coerce
 
 -- | Print some invariant properties of a public key:
 --   its hash and formatted view.

cardano-cli/src/Cardano/CLI/Byron/Tx.hs

@@ -22,6 +22,9 @@ module Cardano.CLI.Byron.Tx
   , toCborTxAux
 
   , ScriptValidity(..)
+
+  , toNewTxFileIn
+  , toNewTxFileOut
   )
 where
 
@@ -32,6 +35,7 @@ import           Data.Bifunctor (Bifunctor (..))
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as LB
+import           Data.Coerce (coerce)
 import qualified Data.List as List
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
@@ -80,7 +84,13 @@ renderByronTxError err =
 
 newtype NewTxFile (direction :: FileDirection) = NewTxFile
   { unNewTxFile :: File direction
-  } deriving newtype (Eq, Ord, Show, IsString, HasFileMode, MapFile, FromJSON, ToJSON)
+  } deriving newtype (Eq, Ord, Show, IsString, MapFile, FromJSON, ToJSON)
+
+toNewTxFileIn :: NewTxFile 'InOut -> NewTxFile 'In
+toNewTxFileIn = coerce
+
+toNewTxFileOut :: NewTxFile 'InOut -> NewTxFile 'Out
+toNewTxFileOut = coerce
 
 
 -- | Pretty-print an address in its Base58 form, and also

cardano-cli/src/Cardano/CLI/Shelley/Commands.hs

@@ -46,12 +46,19 @@ module Cardano.CLI.Shelley.Commands
   , BlockId (..)
   , WitnessSigningData (..)
   , ColdVerificationKeyOrFile (..)
+
+  , toOpCertCounterFileIn
+  , toOpCertCounterFileOut
+  , toWitnessFileIn
+  , toWitnessFileOut
   ) where
 
 import           Prelude
 
 import           Cardano.Api.Shelley
 
+import           Data.Coerce (coerce)
+import           Data.String (IsString)
 import           Data.Text (Text)
 
 import           Cardano.CLI.Shelley.Key (PaymentVerifier, StakeIdentifier, StakeVerifier,
@@ -60,7 +67,6 @@ import           Cardano.CLI.Types
 
 import           Cardano.Chain.Common (BlockCount)
 import           Cardano.Ledger.Shelley.TxBody (MIRPot)
-import           Data.String (IsString)
 
 --
 -- Shelley CLI command data types
@@ -576,15 +582,27 @@ data CardanoAddressKeyType
 
 newtype OpCertCounterFile (direction :: FileDirection) = OpCertCounterFile
   { unOpCertCounterFile :: File direction
-  } deriving newtype (Eq, Ord, Show, IsString, HasFileMode, MapFile, FromJSON, ToJSON)
+  } deriving newtype (Eq, Ord, Show, IsString, MapFile, FromJSON, ToJSON)
+
+toOpCertCounterFileIn :: OpCertCounterFile 'InOut -> OpCertCounterFile 'In
+toOpCertCounterFileIn = coerce
+
+toOpCertCounterFileOut :: OpCertCounterFile 'InOut -> OpCertCounterFile 'Out
+toOpCertCounterFileOut = coerce
 
 newtype PrivKeyFile
   = PrivKeyFile FilePath
   deriving Show
 
 newtype WitnessFile (direction :: FileDirection) = WitnessFile
   { unWitnessFile :: File direction
-  } deriving newtype (Eq, Ord, Show, IsString, HasFileMode, MapFile, FromJSON, ToJSON)
+  } deriving newtype (Eq, Ord, Show, IsString, MapFile, FromJSON, ToJSON)
+
+toWitnessFileIn :: WitnessFile 'InOut -> WitnessFile 'In
+toWitnessFileIn = coerce
+
+toWitnessFileOut :: WitnessFile 'InOut -> WitnessFile 'Out
+toWitnessFileOut = coerce
 
 -- | A raw verification key given in Base64, and decoded into a ByteString.
 newtype VerificationKeyBase64

cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs

@@ -827,18 +827,18 @@ createDelegateKeys dir index = do
   liftIO $ createDirectoryIfMissing False dir
   runGenesisKeyGenDelegate
         (VerificationKeyFile $ File $ dir </> "delegate" ++ strIndex ++ ".vkey")
-        (usingOut @SigningKeyFile coldSK)
-        (usingOut @OpCertCounterFile opCertCtr)
+        (toSigningKeyFileOut coldSK)
+        (toOpCertCounterFileOut opCertCtr)
   runGenesisKeyGenDelegateVRF
         (VerificationKeyFile $ File $ dir </> "delegate" ++ strIndex ++ ".vrf.vkey")
         (SigningKeyFile $ File $ dir </> "delegate" ++ strIndex ++ ".vrf.skey")
   firstExceptT ShelleyGenesisCmdNodeCmdError $ do
     runNodeKeyGenKES
-        (usingOut @VerificationKeyFile kesVK)
+        (toVerificationKeyFileOut kesVK)
         (SigningKeyFile $ File $ dir </> "delegate" ++ strIndex ++ ".kes.skey")
     runNodeIssueOpCert
-        (VerificationKeyFilePath (usingIn @VerificationKeyFile kesVK))
-        (usingIn @SigningKeyFile coldSK)
+        (VerificationKeyFilePath (toVerificationKeyFileIn kesVK))
+        (toSigningKeyFileIn coldSK)
         opCertCtr
         (KESPeriod 0)
         (File $ dir </> "opcert" ++ strIndex ++ ".cert")
@@ -870,18 +870,18 @@ createPoolCredentials dir index = do
   liftIO $ createDirectoryIfMissing False dir
   firstExceptT ShelleyGenesisCmdNodeCmdError $ do
     runNodeKeyGenKES
-        (usingOut @VerificationKeyFile kesVK)
+        (toVerificationKeyFileOut kesVK)
         (SigningKeyFile $ File $ dir </> "kes" ++ strIndex ++ ".skey")
     runNodeKeyGenVRF
         (VerificationKeyFile $ File $ dir </> "vrf" ++ strIndex ++ ".vkey")
         (SigningKeyFile $ File $ dir </> "vrf" ++ strIndex ++ ".skey")
     runNodeKeyGenCold
         (VerificationKeyFile $ File $ dir </> "cold" ++ strIndex ++ ".vkey")
-        (usingOut @SigningKeyFile coldSK)
-        (usingOut @OpCertCounterFile opCertCtr)
+        (toSigningKeyFileOut coldSK)
+        (toOpCertCounterFileOut opCertCtr)
     runNodeIssueOpCert
-        (VerificationKeyFilePath (usingIn @VerificationKeyFile kesVK))
-        (usingIn @SigningKeyFile coldSK)
+        (VerificationKeyFilePath (toVerificationKeyFileIn kesVK))
+        (toSigningKeyFileIn coldSK)
         opCertCtr
         (KESPeriod 0)
         (File $ dir </> "opcert" ++ strIndex ++ ".cert")
@@ -1005,7 +1005,7 @@ readShelleyGenesisWithDefault
   -> (ShelleyGenesis StandardShelley -> ShelleyGenesis StandardShelley)
   -> ExceptT ShelleyGenesisCmdError IO (ShelleyGenesis StandardShelley)
 readShelleyGenesisWithDefault fpath adjustDefaults = do
-    newExceptT (readAndDecodeShelleyGenesis (usingIn @File fpath))
+    newExceptT (readAndDecodeShelleyGenesis (toFileIn fpath))
       `catchError` \err ->
         case err of
           ShelleyGenesisCmdGenesisFileReadError (FileIOError _ ioe)

cardano-cli/src/Cardano/CLI/Shelley/Run/Node.hs

@@ -195,7 +195,7 @@ runNodeIssueOpCert kesVerKeyOrFile
 
     ocertIssueCounter <- firstExceptT ShelleyNodeCmdReadFileError
       . newExceptT
-      $ readFileTextEnvelope AsOperationalCertificateIssueCounter (usingIn @File ocertCtrPath)
+      $ readFileTextEnvelope AsOperationalCertificateIssueCounter (toFileIn ocertCtrPath)
 
     verKeyKes <- firstExceptT ShelleyNodeCmdReadKeyFileError
       . newExceptT
@@ -221,7 +221,7 @@ runNodeIssueOpCert kesVerKeyOrFile
     -- a new cert but without updating the counter.
     firstExceptT ShelleyNodeCmdWriteFileError
       . newExceptT
-      $ writeLazyByteStringFile (usingOut @File ocertCtrPath)
+      $ writeLazyByteStringFile (toFileOut ocertCtrPath)
       $ textEnvelopeToJSON (Just $ ocertCtrDesc $ getCounter nextOcertCtr) nextOcertCtr
 
     firstExceptT ShelleyNodeCmdWriteFileError