Update cardano-submit-api with SocketPath from cardano-api

IntersectMBO · Sep 20, 2022 · 5efb1e3 · 5efb1e3
1 parent 903b1d9
commit 5efb1e3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/cardano-submit-api/src/Cardano/TxSubmit/CLI/Parsers.hs b/cardano-submit-api/src/Cardano/TxSubmit/CLI/Parsers.hs
@@ -11,9 +11,8 @@ module Cardano.TxSubmit.CLI.Parsers
   ) where
 
 import           Cardano.Api (AnyConsensusModeParams (..), ConsensusModeParams (..),
-                   EpochSlots (..), NetworkId (..), NetworkMagic (..))
-import           Cardano.TxSubmit.CLI.Types (ConfigFile (..), SocketPath (..),
-                   TxSubmitNodeParams (..))
+                   EpochSlots (..), NetworkId (..), NetworkMagic (..), SocketPath (..))
+import           Cardano.TxSubmit.CLI.Types (ConfigFile (..), TxSubmitNodeParams (..))
 import           Cardano.TxSubmit.Rest.Parsers (pWebserverConfig)
 import           Control.Applicative (Alternative (..), Applicative (..), (<**>))
 import           Data.Function ((.))

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/CLI/Types.hs b/cardano-submit-api/src/Cardano/TxSubmit/CLI/Types.hs
@@ -1,11 +1,10 @@
 module Cardano.TxSubmit.CLI.Types
   ( ConfigFile (..)
   , GenesisFile (..)
-  , SocketPath (..)
   , TxSubmitNodeParams (..)
   ) where
 
-import           Cardano.Api (AnyConsensusModeParams, NetworkId (..))
+import           Cardano.Api (AnyConsensusModeParams, NetworkId (..), SocketPath)
 import           Cardano.TxSubmit.Rest.Types (WebserverConfig)
 import           Data.Int
 import           System.IO (FilePath)

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/ErrorRender.hs b/cardano-submit-api/src/Cardano/TxSubmit/ErrorRender.hs
@@ -74,5 +74,3 @@ renderEraMismatch EraMismatch{ledgerEraName, otherEraName} =
   "The node is running in the " <> ledgerEraName <>
   " era, but the transaction is for the " <> otherEraName <> " era."
 
-textShow :: Show a => a -> Text
-textShow = T.pack . show
diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Types.hs b/cardano-submit-api/src/Cardano/TxSubmit/Types.hs
@@ -17,7 +17,6 @@ module Cardano.TxSubmit.Types
 
 import           Cardano.Api (AnyCardanoEra, AnyConsensusMode (..), Error (..), TxId)
 import           Cardano.Binary (DecoderError)
-import           Cardano.TxSubmit.Util (textShow)
 import           Data.Aeson (ToJSON (..), Value (..))
 import           Data.ByteString.Char8 (ByteString)
 import           Data.Either (Either (Right))

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Util.hs b/cardano-submit-api/src/Cardano/TxSubmit/Util.hs
@@ -4,15 +4,12 @@ module Cardano.TxSubmit.Util
   ( logException
   ) where
 
+import           Cardano.Api (textShow)
+import           Prelude
+
 import           Cardano.BM.Trace (Trace, logError)
 import           Control.Exception (SomeException, catch, throwIO)
-import           Data.Function (($), (.))
-import           Data.Semigroup (Semigroup ((<>)))
 import           Data.Text (Text)
-import           System.IO (IO)
-import           Text.Show (Show (..))
-
-import qualified Data.Text as T
 
 -- | ouroboros-network catches 'SomeException' and if a 'nullTracer' is passed into that
 -- code, the caught exception will not be logged. Therefore wrap all tx submission code that