From 490fac974566242808ef4e87806558d019c9f22d Mon Sep 17 00:00:00 2001
From: Jordan Millar <jordan.millar@iohk.io>
Date: Fri, 3 Jul 2020 09:34:13 +0100
Subject: [PATCH] Refactoring

---
 cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs | 2 +-
 cardano-config/cardano-config.cabal                | 4 ----
 cardano-config/src/Cardano/Config/Parsers.hs       | 1 -
 cardano-node/cardano-node.cabal                    | 8 ++++----
 cardano-node/src/Cardano/Node/Protocol.hs          | 2 +-
 cardano-node/src/Cardano/Tracing/Tracers.hs        | 2 +-
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs
index 7261120a111..2820803a0c6 100644
--- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs
+++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs
@@ -52,8 +52,8 @@ import qualified Shelley.Spec.Ledger.TxData as Shelley
 import           Cardano.Api.Shelley.Address (ShelleyAddress)
 import           Cardano.Api.Shelley.ColdKeys (KeyRole (..), OperatorKeyRole (..),
                     readVerKey)
-import           Cardano.Api.Shelley.Genesis
 import           Cardano.Api.Shelley.ColdKeys
+import           Cardano.Api.Shelley.Genesis
 import           Cardano.Api.Shelley.OCert
 import           Cardano.Api.Shelley.VRF
 import           Cardano.Api.TextView (TextViewTitle (..))
diff --git a/cardano-config/cardano-config.cabal b/cardano-config/cardano-config.cabal
index 7b3e6ff8cd2..b66620ba038 100644
--- a/cardano-config/cardano-config.cabal
+++ b/cardano-config/cardano-config.cabal
@@ -62,7 +62,6 @@ library
                      , directory
                      , file-embed
                      , filepath
-                     , generic-monoid
                      , iohk-monitoring
                      , lobemo-backend-aggregation
                      , lobemo-backend-ekg
@@ -80,19 +79,16 @@ library
                      , ouroboros-network-framework
                      , process
                      , iproute
-                     , safe-exceptions
                      , scientific
                      , shelley-spec-ledger
                      , string-conv
                      , stm
                      , template-haskell
                      , text
-                     , time
                      , transformers
                      , transformers-except
                      , typed-protocols
                      , unordered-containers
-                     , yaml
 
   default-language:    Haskell2010
   default-extensions:  NoImplicitPrelude
diff --git a/cardano-config/src/Cardano/Config/Parsers.hs b/cardano-config/src/Cardano/Config/Parsers.hs
index a0b80488ee4..a9bf4113aad 100644
--- a/cardano-config/src/Cardano/Config/Parsers.hs
+++ b/cardano-config/src/Cardano/Config/Parsers.hs
@@ -31,7 +31,6 @@ import           Prelude (String)
 import           Cardano.Prelude hiding (option)
 
 import           Cardano.Chain.Common (Lovelace, mkLovelace)
---import           Cardano.Node.Topology
 import           Cardano.Config.Types
 
 
diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
index dc96965e26e..19256a1d463 100644
--- a/cardano-node/cardano-node.cabal
+++ b/cardano-node/cardano-node.cabal
@@ -36,13 +36,13 @@ library
   exposed-modules:     Cardano.Common.Help
                        Cardano.Node.Features.Node
                        Cardano.Node.Logging
+                       Cardano.Node.Parsers
                        Cardano.Node.Protocol
                        Cardano.Node.Protocol.Byron
                        Cardano.Node.Protocol.Cardano
                        Cardano.Node.Protocol.Mock
                        Cardano.Node.Protocol.Shelley
                        Cardano.Node.Protocol.Types
-                       Cardano.Node.Parsers
                        Cardano.Node.Run
                        Cardano.Node.Shutdown
                        Cardano.Node.Topology
@@ -83,7 +83,7 @@ library
                      , lobemo-backend-trace-forwarder
                      , network
                      , network-mux
-                     , node-config
+                     , cardano-node-config
                      , optparse-applicative
                      , ouroboros-consensus
                      , ouroboros-consensus-byron
@@ -127,7 +127,7 @@ library
                      , Cardano.Node.TUI.Run
 
 
-library node-config
+library cardano-node-config
 
   hs-source-dirs:      src
 
@@ -210,7 +210,7 @@ executable chairman
                      , cardano-prelude
                      , io-sim-classes
                      , network-mux
-                     , node-config
+                     , cardano-node-config
                      , optparse-applicative
                      , ouroboros-consensus
                      , ouroboros-consensus-cardano
diff --git a/cardano-node/src/Cardano/Node/Protocol.hs b/cardano-node/src/Cardano/Node/Protocol.hs
index 018a6ce5428..da99a4d336f 100644
--- a/cardano-node/src/Cardano/Node/Protocol.hs
+++ b/cardano-node/src/Cardano/Node/Protocol.hs
@@ -13,9 +13,9 @@ import           Control.Monad.Trans.Except (ExceptT)
 import           Control.Monad.Trans.Except.Extra (firstExceptT)
 
 import           Cardano.Api.Protocol (MockProtocol(..))
+import           Cardano.Config.Types (ProtocolFilepaths(..))
 import           Cardano.Node.Types (NodeConfiguration(..), NodeProtocolConfiguration(..),
                     NodeMockProtocolConfiguration(..))
-import           Cardano.Config.Types (ProtocolFilepaths(..))
 
 import           Cardano.Node.Protocol.Types (SomeConsensusProtocol(..))
 import           Cardano.Node.Protocol.Mock
diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs
index 72d36657ff8..1df692aca52 100644
--- a/cardano-node/src/Cardano/Tracing/Tracers.hs
+++ b/cardano-node/src/Cardano/Tracing/Tracers.hs
@@ -81,10 +81,10 @@ import qualified Ouroboros.Consensus.Storage.ChainDB as ChainDB
 import qualified Ouroboros.Consensus.Storage.LedgerDB.OnDisk as LedgerDB
 
 import           Cardano.Config.LedgerQueries
-import           Cardano.Node.TraceConfig
 import           Cardano.Config.Types
                    (TraceConstraints, HasKESMetricsData (..), KESMetricsData (..),
                     MaxKESEvolutions (..), OperationalCertStartKESPeriod (..))
+import           Cardano.Node.TraceConfig
 import           Cardano.Tracing.Kernel
 import           Cardano.Tracing.MicroBenchmarking