Rebase changes

Author: Jimbo4350

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

@@ -5,6 +5,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
 {-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
 
 {-# HLINT ignore "Redundant id" #-}
@@ -111,13 +112,13 @@ runGovernanceVoteViewCmd
         fmap fst $
           fromExceptTCli $
             readVoteScriptWitness eon (voteFile, Nothing)
-      fromEitherIOCli
-        . ( outFormat
+      let output =
+            outFormat
               & ( id
                     . Vary.on (\FormatJson -> Json.encodeJson)
                     . Vary.on (\FormatYaml -> Json.encodeYaml)
                     $ Vary.exhaustiveCase
                 )
               $ unVotingProcedures voteProcedures
 
-      firstExceptT GovernanceVoteCmdWriteError $ newExceptT $ writeLazyByteStringOutput mOutFile output
+      fromEitherIOCli @(FileError ()) $ writeLazyByteStringOutput mOutFile output

cardano-cli/src/Cardano/CLI/Legacy/Governance/Run.hs

@@ -29,7 +29,6 @@ import Cardano.CLI.Type.Error.GovernanceCmdError
 import Control.Monad
 import Data.Aeson (eitherDecode)
 import Data.ByteString.Lazy qualified as LB
-import Data.Text (Text)
 
 runLegacyGovernanceCmds :: LegacyGovernanceCmds -> CIO e ()
 runLegacyGovernanceCmds = \case