Remove SocketPath definition from cardano-node

Remove SocketPath definition and textShow from cardano-submit-api Remove SocketPath definition from cardano-cli
IntersectMBO · Sep 23, 2022 · 221d6fa · 221d6fa
1 parent 885ca6b
commit 221d6fa
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 35 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Types.hs b/cardano-cli/src/Cardano/CLI/Types.hs
@@ -23,7 +23,6 @@ module Cardano.CLI.Types
   , TxBuildOutputOptions(..)
   , ReferenceScriptAnyEra (..)
   , SigningKeyFile (..)
-  , SocketPath (..)
   , ScriptFile (..)
   , ScriptDataOrFile (..)
   , ScriptRedeemerOrFile
@@ -259,8 +258,6 @@ newtype SigningKeyFile = SigningKeyFile
   deriving stock (Eq, Ord)
   deriving newtype (IsString, Show)
 
-newtype SocketPath = SocketPath { unSocketPath :: FilePath }
-
 newtype UpdateProposalFile = UpdateProposalFile { unUpdateProposalFile :: FilePath }
                              deriving newtype (Eq, Show)
 

diff --git a/cardano-node/src/Cardano/Node/Configuration/NodeAddress.hs b/cardano-node/src/Cardano/Node/Configuration/NodeAddress.hs
@@ -1,11 +1,10 @@
-{-# LANGUAGE DeriveFunctor              #-}
-{-# LANGUAGE DerivingStrategies         #-}
-{-# LANGUAGE FlexibleInstances          #-}
+{-# LANGUAGE DeriveFunctor #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GeneralisedNewtypeDeriving #-}
-{-# LANGUAGE ImportQualifiedPost        #-}
-{-# LANGUAGE MonoLocalBinds             #-}
-{-# LANGUAGE NamedFieldPuns             #-}
-{-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE MonoLocalBinds #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Cardano.Node.Configuration.NodeAddress
   ( -- * Node addresses
@@ -30,19 +29,19 @@ module Cardano.Node.Configuration.NodeAddress
   , SocketPath(..)
   ) where
 
-import Cardano.Prelude
-import Prelude (fail)
+import           Cardano.Api
+import           Cardano.Prelude
+import           Prelude (fail)
 
-import Data.Aeson (FromJSON (..), ToJSON (..), Value (..),
-                   (.:), (.=), withObject, object)
-import Data.IP (IP (..), IPv4, IPv6)
-import Data.IP qualified as IP
-import Data.Text qualified as Text
-import Data.Text.Encoding qualified as Text
-import Network.DNS qualified as DNS (Domain)
-import Network.Socket (PortNumber, SockAddr (..))
+import           Data.Aeson (FromJSON (..), ToJSON (..), Value (..), object, withObject, (.:), (.=))
+import           Data.IP (IP (..), IPv4, IPv6)
+import qualified Data.IP as IP
+import qualified Data.Text as Text
+import qualified Data.Text.Encoding as Text
+import qualified Network.DNS as DNS (Domain)
+import           Network.Socket (PortNumber, SockAddr (..))
 
-import Ouroboros.Network.PeerSelection.RootPeersDNS (DomainAccessPoint (..))
+import           Ouroboros.Network.PeerSelection.RootPeersDNS (DomainAccessPoint (..))
 
 
 -- | IPv4 or IPv6 address with a port number.
@@ -159,10 +158,3 @@ newtype NodeHostDnsAddress
 nodeHostDnsAddressToDomain :: NodeHostDnsAddress -> DNS.Domain
 nodeHostDnsAddressToDomain = Text.encodeUtf8 . unNodeHostDnsAddress
 
-
--- | Socket path
---
-newtype SocketPath = SocketPath
-  { unSocketPath :: FilePath }
-  deriving stock (Eq, Ord)
-  deriving newtype (FromJSON, IsString, Show)
diff --git a/cardano-node/src/Cardano/Node/Types.hs b/cardano-node/src/Cardano/Node/Types.hs
@@ -39,7 +39,6 @@ import           Cardano.Api
 import qualified Cardano.Chain.Update as Byron
 import           Cardano.Crypto (RequiresNetworkMagic (..))
 import qualified Cardano.Crypto.Hash as Crypto
-import           Cardano.Node.Configuration.NodeAddress
 import           Cardano.Node.Configuration.Socket (SocketConfig (..))
 
 --TODO: things will probably be clearer if we don't use these newtype wrappers and instead

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/CLI/Types.hs b/cardano-submit-api/src/Cardano/TxSubmit/CLI/Types.hs
@@ -28,6 +28,3 @@ newtype GenesisFile = GenesisFile
   { unGenesisFile :: FilePath
   }
 
-newtype SocketPath = SocketPath
-  { unSocketPath :: FilePath
-  }
diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Util.hs b/cardano-submit-api/src/Cardano/TxSubmit/Util.hs
@@ -2,7 +2,6 @@
 
 module Cardano.TxSubmit.Util
   ( logException
-  , textShow
   ) where
 
 import           Cardano.BM.Trace (Trace, logError)
@@ -27,5 +26,4 @@ logException tracer txt action = action `catch` logger
       logError tracer $ txt <> textShow e
       throwIO e
 
-textShow :: Show a => a -> Text
-textShow = T.pack . show
+