Merge pull request #1228 from IntersectMBO/jordan/remove-MonadIOTransError

Remove `MonadIOTransError`

Author: Jimbo4350

cardano-cli/src/Cardano/CLI/Compatible/StakePool/Run.hs

@@ -56,25 +56,19 @@ runStakePoolRegistrationCertificateCmd
 
       -- VRF verification key
       vrfVerKey <-
-        fromExceptTCli $
-          firstExceptT StakePoolCmdReadKeyFileError $
-            readVerificationKeyOrFile vrfVerificationKeyOrFile
+        readVerificationKeyOrFile vrfVerificationKeyOrFile
       let vrfKeyHash' = verificationKeyHash vrfVerKey
 
       -- Pool reward account
       rwdStakeVerKey <-
-        fromExceptTCli $
-          firstExceptT StakePoolCmdReadKeyFileError $
-            readVerificationKeyOrFile rewardStakeVerificationKeyOrFile
+        readVerificationKeyOrFile rewardStakeVerificationKeyOrFile
       let stakeCred = StakeCredentialByKey (verificationKeyHash rwdStakeVerKey)
           rewardAccountAddr = makeStakeAddress network stakeCred
 
       -- Pool owner(s)
       sPoolOwnerVkeys <-
         forM ownerStakeVerificationKeyOrFiles $
-          fromExceptTCli
-            . firstExceptT StakePoolCmdReadKeyFileError
-            . readVerificationKeyOrFile
+          readVerificationKeyOrFile
       let stakePoolOwners' = map verificationKeyHash sPoolOwnerVkeys
 
       let stakePoolParams =

cardano-cli/src/Cardano/CLI/Compatible/Transaction/Run.hs

@@ -24,8 +24,10 @@ import Cardano.CLI.Compatible.Transaction.Command
 import Cardano.CLI.Compatible.Transaction.ScriptWitness
 import Cardano.CLI.Compatible.Transaction.TxOut
 import Cardano.CLI.EraBased.Script.Certificate.Type
+import Cardano.CLI.EraBased.Script.Proposal.Read
 import Cardano.CLI.EraBased.Script.Proposal.Type
 import Cardano.CLI.EraBased.Script.Type
+import Cardano.CLI.EraBased.Script.Vote.Read
 import Cardano.CLI.EraBased.Script.Vote.Type
   ( VoteScriptWitness (..)
   )

cardano-cli/src/Cardano/CLI/Compatible/Transaction/ScriptWitness.hs

@@ -32,6 +32,7 @@ import Cardano.CLI.EraBased.Script.Certificate.Type
 import Cardano.CLI.EraBased.Script.Read.Common
 import Cardano.CLI.EraBased.Script.Type
 import Cardano.CLI.EraBased.Script.Type qualified as Exp
+import Cardano.CLI.Read
 import Cardano.CLI.Type.Common (CertificateFile)
 
 import Control.Monad
@@ -53,8 +54,7 @@ readCertificateScriptWitness sbe certScriptReq =
     OnDiskSimpleScript scriptFp -> do
       let sFp = unFile scriptFp
       s <-
-        fromExceptTCli $
-          readFileSimpleScript sFp
+        readFileSimpleScript sFp
       case s of
         SimpleScript ss -> do
           return $
@@ -65,8 +65,7 @@ readCertificateScriptWitness sbe certScriptReq =
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits) -> do
         let plutusScriptFp = unFile scriptFp
         plutusScript <-
-          fromExceptTCli $
-            readFilePlutusScript plutusScriptFp
+          readFilePlutusScript plutusScriptFp
         redeemer <-
           fromExceptTCli $
             readScriptDataOrFile redeemerFile

cardano-cli/src/Cardano/CLI/Compatible/Transaction/TxOut.hs

@@ -91,7 +91,7 @@ getReferenceScript
   -> CIO e (ReferenceScript era)
 getReferenceScript w = \case
   ReferenceScriptAnyEraNone -> return ReferenceScriptNone
-  ReferenceScriptAnyEra fp -> ReferenceScript w <$> fromExceptTCli (readFileScriptInAnyLang fp)
+  ReferenceScriptAnyEra fp -> ReferenceScript w <$> readFileScriptInAnyLang fp
 
 -- | An enumeration of era-dependent features where we have to check that it
 -- is permissible to use this feature in this era.

cardano-cli/src/Cardano/CLI/EraBased/Genesis/CreateTestnetData/Run.hs

@@ -248,7 +248,7 @@ runGenesisCreateTestNetDataCmd
       fromMaybe (alonzoGenesisDefaults era)
         <$> traverse (fromExceptTCli . decodeAlonzoGenesisFile (Just era)) specAlonzo
     conwayGenesis <-
-      fromMaybe conwayGenesisDefaults <$> traverse (fromExceptTCli . decodeConwayGenesisFile) specConway
+      fromMaybe conwayGenesisDefaults <$> fromExceptTCli (traverse decodeConwayGenesisFile specConway)
 
     -- Read NetworkId either from file or from the flag. Flag overrides template file.
     let actualNetworkId =
@@ -631,19 +631,18 @@ createDelegateKeys fmt dir = do
     runGenesisKeyGenDelegateVRF
       (File @(VerificationKey ()) $ dir </> "vrf.vkey")
       (File @(SigningKey ()) $ dir </> "vrf.skey")
-  fromExceptTCli $ do
-    runNodeKeyGenKesCmd $
-      Cmd.NodeKeyGenKESCmdArgs
-        fmt
-        (onlyOut kesVK)
-        (File @(SigningKey ()) $ dir </> "kes.skey")
-    runNodeIssueOpCertCmd $
-      Cmd.NodeIssueOpCertCmdArgs
-        (VerificationKeyFilePath (onlyIn kesVK))
-        (onlyIn coldSK)
-        opCertCtr
-        (KESPeriod 0)
-        (File $ dir </> "opcert.cert")
+  runNodeKeyGenKesCmd $
+    Cmd.NodeKeyGenKESCmdArgs
+      fmt
+      (onlyOut kesVK)
+      (File @(SigningKey ()) $ dir </> "kes.skey")
+  runNodeIssueOpCertCmd $
+    Cmd.NodeIssueOpCertCmdArgs
+      (VerificationKeyFilePath (onlyIn kesVK))
+      (onlyIn coldSK)
+      opCertCtr
+      (KESPeriod 0)
+      (File $ dir </> "opcert.cert")
  where
   kesVK = File @(VerificationKey ()) $ dir </> "kes.vkey"
   coldSK = File @(SigningKey ()) $ dir </> "key.skey"
@@ -693,33 +692,32 @@ createPoolCredentials
   -> CIO e ()
 createPoolCredentials fmt dir = do
   liftIO $ createDirectoryIfMissing True dir
-  fromExceptTCli $ do
-    runNodeKeyGenKesCmd $
-      Cmd.NodeKeyGenKESCmdArgs
-        fmt
-        (onlyOut kesVK)
-        (File @(SigningKey ()) $ dir </> "kes.skey")
-
-    runNodeKeyGenVrfCmd $
-      Cmd.NodeKeyGenVRFCmdArgs
-        fmt
-        (File @(VerificationKey ()) $ dir </> "vrf.vkey")
-        (File @(SigningKey ()) $ dir </> "vrf.skey")
-
-    runNodeKeyGenColdCmd $
-      Cmd.NodeKeyGenColdCmdArgs
-        fmt
-        (File @(VerificationKey ()) $ dir </> "cold.vkey")
-        (onlyOut coldSK)
-        (onlyOut opCertCtr)
-
-    runNodeIssueOpCertCmd $
-      Cmd.NodeIssueOpCertCmdArgs
-        (VerificationKeyFilePath (onlyIn kesVK))
-        (onlyIn coldSK)
-        opCertCtr
-        (KESPeriod 0)
-        (File $ dir </> "opcert.cert")
+  runNodeKeyGenKesCmd $
+    Cmd.NodeKeyGenKESCmdArgs
+      fmt
+      (onlyOut kesVK)
+      (File @(SigningKey ()) $ dir </> "kes.skey")
+
+  runNodeKeyGenVrfCmd $
+    Cmd.NodeKeyGenVRFCmdArgs
+      fmt
+      (File @(VerificationKey ()) $ dir </> "vrf.vkey")
+      (File @(SigningKey ()) $ dir </> "vrf.skey")
+
+  runNodeKeyGenColdCmd $
+    Cmd.NodeKeyGenColdCmdArgs
+      fmt
+      (File @(VerificationKey ()) $ dir </> "cold.vkey")
+      (onlyOut coldSK)
+      (onlyOut opCertCtr)
+
+  runNodeIssueOpCertCmd $
+    Cmd.NodeIssueOpCertCmdArgs
+      (VerificationKeyFilePath (onlyIn kesVK))
+      (onlyIn coldSK)
+      opCertCtr
+      (KESPeriod 0)
+      (File $ dir </> "opcert.cert")
 
   void $
     runStakeAddressKeyGenCmd

cardano-cli/src/Cardano/CLI/EraBased/Genesis/Internal/Common.hs

@@ -75,8 +75,10 @@ readAndDecodeGenesisFileWith
 readAndDecodeGenesisFileWith decode' fpath = do
   lbs <-
     handleIOExceptionsLiftWith (GenesisCmdGenesisFileError . FileIOError fpath) . liftIO $
-      LBS.readFile fpath
-  modifyError (GenesisCmdGenesisFileDecodeError fpath . Text.pack)
+      LBS.readFile
+        fpath
+  modifyError
+    (GenesisCmdGenesisFileDecodeError fpath . Text.pack)
     . hoistEither
     $ decode' lbs
 

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

@@ -68,7 +68,6 @@ import Cardano.Protocol.Crypto qualified as C
 import Control.DeepSeq (NFData, force)
 import Control.Exception (evaluate)
 import Control.Monad (forM, forM_, unless, when)
-import Data.Aeson hiding (Key)
 import Data.Aeson qualified as Aeson
 import Data.Aeson.KeyMap qualified as Aeson
 import Data.Bifunctor (Bifunctor (..))
@@ -634,7 +633,9 @@ runGenesisCreateStakedCmd
     template <-
       fromExceptTCli $ decodeShelleyGenesisWithDefault (rootdir </> "genesis.spec.json") adjustTemplate
     alonzoGenesis <-
-      fromExceptTCli $ decodeAlonzoGenesisFile (Just era) $ rootdir </> "genesis.alonzo.spec.json"
+      fromExceptTCli $
+        decodeAlonzoGenesisFile (Just era) $
+          rootdir </> "genesis.alonzo.spec.json"
     conwayGenesis <- fromExceptTCli $ decodeConwayGenesisFile $ rootdir </> "genesis.conway.spec.json"
 
     forM_ [1 .. numGenesisKeys] $ \index -> do
@@ -861,19 +862,19 @@ createDelegateKeys fmt dir index = do
     TN.runGenesisKeyGenDelegateVRF
       (File @(VerificationKey ()) $ dir </> "delegate" ++ strIndex ++ ".vrf.vkey")
       (File @(SigningKey ()) $ dir </> "delegate" ++ strIndex ++ ".vrf.skey")
-  fromExceptTCli $ do
-    runNodeKeyGenKesCmd $
-      Cmd.NodeKeyGenKESCmdArgs
-        fmt
-        (onlyOut kesVK)
-        (File @(SigningKey ()) $ dir </> "delegate" ++ strIndex ++ ".kes.skey")
-    runNodeIssueOpCertCmd $
-      Cmd.NodeIssueOpCertCmdArgs
-        (VerificationKeyFilePath (onlyIn kesVK))
-        (onlyIn coldSK)
-        opCertCtr
-        (KESPeriod 0)
-        (File $ dir </> "opcert" ++ strIndex ++ ".cert")
+
+  runNodeKeyGenKesCmd $
+    Cmd.NodeKeyGenKESCmdArgs
+      fmt
+      (onlyOut kesVK)
+      (File @(SigningKey ()) $ dir </> "delegate" ++ strIndex ++ ".kes.skey")
+  runNodeIssueOpCertCmd $
+    Cmd.NodeIssueOpCertCmdArgs
+      (VerificationKeyFilePath (onlyIn kesVK))
+      (onlyIn coldSK)
+      opCertCtr
+      (KESPeriod 0)
+      (File $ dir </> "opcert" ++ strIndex ++ ".cert")
  where
   strIndex = show index
   kesVK = File @(VerificationKey ()) $ dir </> "delegate" ++ strIndex ++ ".kes.vkey"
@@ -907,30 +908,30 @@ createPoolCredentials
   -> CIO e ()
 createPoolCredentials fmt dir index = do
   liftIO $ createDirectoryIfMissing False dir
-  fromExceptTCli $ do
-    runNodeKeyGenKesCmd $
-      Cmd.NodeKeyGenKESCmdArgs
-        fmt
-        (onlyOut kesVK)
-        (File @(SigningKey ()) $ dir </> "kes" ++ strIndex ++ ".skey")
-    runNodeKeyGenVrfCmd $
-      Cmd.NodeKeyGenVRFCmdArgs
-        fmt
-        (File @(VerificationKey ()) $ dir </> "vrf" ++ strIndex ++ ".vkey")
-        (File @(SigningKey ()) $ dir </> "vrf" ++ strIndex ++ ".skey")
-    runNodeKeyGenColdCmd $
-      Cmd.NodeKeyGenColdCmdArgs
-        fmt
-        (File @(VerificationKey ()) $ dir </> "cold" ++ strIndex ++ ".vkey")
-        (onlyOut coldSK)
-        (onlyOut opCertCtr)
-    runNodeIssueOpCertCmd $
-      Cmd.NodeIssueOpCertCmdArgs
-        (VerificationKeyFilePath (onlyIn kesVK))
-        (onlyIn coldSK)
-        opCertCtr
-        (KESPeriod 0)
-        (File $ dir </> "opcert" ++ strIndex ++ ".cert")
+
+  runNodeKeyGenKesCmd $
+    Cmd.NodeKeyGenKESCmdArgs
+      fmt
+      (onlyOut kesVK)
+      (File @(SigningKey ()) $ dir </> "kes" ++ strIndex ++ ".skey")
+  runNodeKeyGenVrfCmd $
+    Cmd.NodeKeyGenVRFCmdArgs
+      fmt
+      (File @(VerificationKey ()) $ dir </> "vrf" ++ strIndex ++ ".vkey")
+      (File @(SigningKey ()) $ dir </> "vrf" ++ strIndex ++ ".skey")
+  runNodeKeyGenColdCmd $
+    Cmd.NodeKeyGenColdCmdArgs
+      fmt
+      (File @(VerificationKey ()) $ dir </> "cold" ++ strIndex ++ ".vkey")
+      (onlyOut coldSK)
+      (onlyOut opCertCtr)
+  runNodeIssueOpCertCmd $
+    Cmd.NodeIssueOpCertCmdArgs
+      (VerificationKeyFilePath (onlyIn kesVK))
+      (onlyIn coldSK)
+      opCertCtr
+      (KESPeriod 0)
+      (File $ dir </> "opcert" ++ strIndex ++ ".cert")
   void $
     runStakeAddressKeyGenCmd
       fmt
@@ -1074,7 +1075,7 @@ decodeShelleyGenesisWithDefault fpath adjustDefaults = do
 
   writeDefault = do
     handleIOExceptT (GenesisCmdGenesisFileError . FileIOError fpath) $
-      LBS.writeFile fpath (encode defaults)
+      LBS.writeFile fpath (Aeson.encode defaults)
     return defaults
 
 updateTemplate

cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Run.hs

@@ -25,6 +25,7 @@ import Cardano.Api.Ledger qualified as L
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.EraBased.Governance.Actions.Command
 import Cardano.CLI.EraBased.Governance.Actions.Command qualified as Cmd
+import Cardano.CLI.EraBased.Script.Proposal.Read
 import Cardano.CLI.EraBased.Script.Proposal.Type
 import Cardano.CLI.EraIndependent.Hash.Internal.Common (getByteStringFromURL, httpsAndIpfsSchemes)
 import Cardano.CLI.Json.Friendly
@@ -261,17 +262,15 @@ runGovernanceActionUpdateCommitteeCmd
     fromExceptTCli $ carryHashChecks checkProposalHash proposalAnchor ProposalCheck
 
     oldCommitteeKeyHashes <- forM oldCommitteeVkeySource $ \vkeyOrHashOrTextFile ->
-      fromExceptTCli $
-        readVerificationKeyOrHashOrFileOrScriptHash
-          unCommitteeColdKeyHash
-          vkeyOrHashOrTextFile
+      readVerificationKeyOrHashOrFileOrScriptHash
+        unCommitteeColdKeyHash
+        vkeyOrHashOrTextFile
 
     newCommitteeKeyHashes <- forM newCommitteeVkeySource $ \(vkeyOrHashOrTextFile, expEpoch) -> do
       kh <-
-        fromExceptTCli $
-          readVerificationKeyOrHashOrFileOrScriptHash
-            unCommitteeColdKeyHash
-            vkeyOrHashOrTextFile
+        readVerificationKeyOrHashOrFileOrScriptHash
+          unCommitteeColdKeyHash
+          vkeyOrHashOrTextFile
       pure (kh, expEpoch)
 
     depositStakeCredential <-

cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Run.hs

@@ -146,11 +146,9 @@ runGovernanceCommitteeCreateHotKeyAuthorizationCertificate
     } =
     obtainCommonConstraints eon $ do
       hotCred <-
-        fromExceptTCli $
-          readVerificationKeySource unCommitteeHotKeyHash vkeyHotKeySource
+        readVerificationKeySource unCommitteeHotKeyHash vkeyHotKeySource
       coldCred <-
-        fromExceptTCli $
-          readVerificationKeySource unCommitteeColdKeyHash vkeyColdKeySource
+        readVerificationKeySource unCommitteeColdKeyHash vkeyColdKeySource
       fromEitherIOCli @(FileError ()) $
         makeCommitteeHotKeyAuthorizationCertificate
           (CommitteeHotKeyAuthorizationRequirements (convert eon) coldCred hotCred)
@@ -173,8 +171,7 @@ runGovernanceCommitteeColdKeyResignationCertificate
     } =
     obtainCommonConstraints era $ do
       coldVKeyCred <-
-        fromExceptTCli $
-          readVerificationKeySource unCommitteeColdKeyHash vkeyColdKeySource
+        readVerificationKeySource unCommitteeColdKeyHash vkeyColdKeySource
 
       mapM_
         (fromExceptTCli . carryHashChecks)

cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Run.hs

@@ -87,8 +87,7 @@ runGovernanceDRepIdCmd
     , mOutFile
     } = do
     drepVerKeyHash <-
-      fromExceptTCli $
-        readVerificationKeyOrHashOrTextEnvFile vkeySource
+      readVerificationKeyOrHashOrTextEnvFile vkeySource
 
     content <-
       pure $
@@ -129,7 +128,7 @@ runGovernanceDRepRegistrationCertificateCmd
     , mAnchor
     , outFile
     } = Exp.obtainCommonConstraints w $ do
-    drepCred <- fromExceptTCli $ readDRepCredential drepHashSource
+    drepCred <- readDRepCredential drepHashSource
 
     mapM_
       (fromExceptTCli . carryHashChecks)
@@ -157,7 +156,7 @@ runGovernanceDRepRetirementCertificateCmd
     , deposit
     , outFile
     } = Exp.obtainCommonConstraints w $ do
-    drepCredential <- fromExceptTCli $ readDRepCredential drepHashSource
+    drepCredential <- readDRepCredential drepHashSource
     makeDrepUnregistrationCertificate
       (DRepUnregistrationRequirements (convert w) drepCredential deposit)
       & writeFileTextEnvelope
@@ -179,7 +178,7 @@ runGovernanceDRepUpdateCertificateCmd
     mapM_
       (fromExceptTCli . carryHashChecks)
       mAnchor
-    drepCredential <- fromExceptTCli $ readDRepCredential drepHashSource
+    drepCredential <- readDRepCredential drepHashSource
     let updateCertificate =
           makeDrepUpdateCertificate
             (DRepUpdateRequirements (convert w) drepCredential)