Merge pull request #3264 from input-output-hk/coot/cdec-439

[CDEC-439] Cleaning ntp client

Author: coot

auxx/Main.hs

@@ -11,6 +11,8 @@ import qualified Network.Transport.TCP as TCP (TCPAddr (..))
 import qualified System.IO.Temp as Temp
 import           System.Wlog (LoggerName, logInfo)
 
+import           Ntp.Client (NtpConfiguration)
+
 import qualified Pos.Client.CLI as CLI
 import           Pos.Context (NodeContext (..))
 import           Pos.Core (ConfigurationError, epochSlots)
@@ -21,7 +23,6 @@ import           Pos.Infra.Diffusion.Types (Diffusion, hoistDiffusion)
 import           Pos.Infra.Network.Types (NetworkConfig (..), Topology (..),
                      topologyDequeuePolicy, topologyEnqueuePolicy,
                      topologyFailurePolicy)
-import           Pos.Infra.Ntp.Configuration (NtpConfiguration)
 import           Pos.Launcher (HasConfigurations, NodeParams (..),
                      NodeResources (..), bracketNodeResources, loggerBracket,
                      lpConsoleLog, runNode, runRealMode, withConfigurations)

auxx/cardano-sl-auxx.cabal

@@ -134,6 +134,7 @@ executable cardano-auxx
                      , cardano-sl-crypto
                      , cardano-sl-db
                      , cardano-sl-infra
+                     , cardano-sl-networking
                      , cardano-sl-txp
                      , cardano-sl-util
                      , log-warper

infra/cardano-sl-infra.cabal

@@ -99,9 +99,6 @@ library
                         Pos.Infra.Statistics.Ekg
                         Pos.Infra.Statistics.Statsd
 
-                        -- NTP
-                        Pos.Infra.Ntp.Configuration
-
                         -- Pos.Infra.Binary
                         Pos.Infra.Binary
                         Pos.Infra.Binary.DHTModel
@@ -117,7 +114,6 @@ library
   other-modules:        Paths_cardano_sl_infra
 
   build-depends:        aeson
-                      , aeson-options
                       , async
                       , base
                       , parsec

infra/src/Pos/Infra/Ntp.hs

@@ -23,6 +23,8 @@ import           Text.Parsec (parserFail, try)
 import qualified Text.Parsec.Char as P
 import qualified Text.Parsec.Text as P
 
+import           Ntp.Client (NtpConfiguration)
+
 import           Pos.Block.Configuration (blockConfiguration)
 import           Pos.Client.CLI.NodeOptions (CommonNodeArgs (..))
 import           Pos.Client.CLI.Options (configurationOptions)
@@ -35,7 +37,6 @@ import           Pos.Core.Genesis (gdStartTime)
 import           Pos.Core.NetworkAddress (addrParser)
 import           Pos.Crypto (decodeAbstractHash)
 import           Pos.Delegation.Configuration (dlgConfiguration)
-import           Pos.Infra.Ntp.Configuration (NtpConfiguration)
 import           Pos.Launcher.Configuration (Configuration (..),
                      HasConfigurations)
 import           Pos.Security.Params (AttackTarget (..), AttackType (..))

infra/src/Pos/Infra/Ntp/Configuration.hs

@@ -34,6 +34,8 @@ import           System.FilePath (takeDirectory)
 import           System.Wlog (LoggerName, WithLogger, askLoggerName, logInfo,
                      usingLoggerName)
 
+import           Ntp.Client (NtpConfiguration)
+
 -- FIXME consistency on the locus of the JSON instances for configuration.
 -- Core keeps them separate, infra update and ssc define them on-site.
 import           Pos.Aeson.Core.Configuration ()
@@ -46,7 +48,6 @@ import           Pos.Block.Configuration
 import           Pos.Configuration
 import           Pos.Core.Configuration
 import           Pos.Delegation.Configuration
-import           Pos.Infra.Ntp.Configuration
 import           Pos.Ssc.Configuration
 import           Pos.Txp.Configuration
 import           Pos.Update.Configuration

lib/src/Pos/Client/CLI/Util.hs

@@ -24,6 +24,8 @@ import           Universum
 
 import qualified Data.Aeson as J
 
+import           Ntp.Client (NtpConfiguration)
+
 import           Pos.Block.Configuration (HasBlockConfiguration,
                      withBlockConfiguration)
 import           Pos.Configuration (HasNodeConfiguration, withNodeConfiguration)
@@ -34,7 +36,6 @@ import           Pos.Core.Genesis (GenesisSpec (..))
 import           Pos.Core.Update (BlockVersionData)
 import           Pos.Crypto (ProtocolMagic)
 import           Pos.Delegation (HasDlgConfiguration, withDlgConfiguration)
-import           Pos.Infra.Ntp.Configuration (NtpConfiguration)
 import           Pos.Launcher.Configuration (Configuration (..),
                      HasConfigurations)
 import           Pos.Ssc.Configuration (HasSscConfiguration,

lib/src/Pos/Launcher/Configuration.hs

@@ -33,14 +33,15 @@ Library
                         Node.Util.Monitor
 
                         Ntp.Client
+                        Ntp.Util
+                        Ntp.Packet
 
                         Bench.Network.Commons
 
-  other-modules:        Ntp.Packet
-                        Ntp.Util
-                        Data.NonEmptySet
+  other-modules:        Data.NonEmptySet
 
   build-depends:        aeson
+                      , aeson-options
                       , async
                       , attoparsec
                       , base
@@ -69,6 +70,7 @@ Library
                       , safe-exceptions
                       , stm
                       , text
+                      , these
                       , formatting
                       , time
                       , time-units
@@ -223,6 +225,7 @@ test-suite cardano-sl-networking-test
   main-is:             Test.hs
   other-modules:       Spec
                        Test.NodeSpec
+                       Test.NtpSpec
                        Test.Network.Broadcast.OutboundQueueSpec
                        Test.Util
   type:                exitcode-stdio-1.0