Add dependency cardano-sl-infra

Added cardano-sl-infra so function bracketTransportTCP can be used.
kbaaziz · Mar 25, 2018 · 516020b · 516020b
1 parent e5f4565
commit 516020b
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 14 deletions.
diff --git a/disciplina.cabal b/disciplina.cabal
@@ -38,14 +38,19 @@ library
                      , AVL
                      , binary
                      , bytestring
+                     , cardano-sl-infra
                      , cardano-sl-networking
+                     , cardano-report-server
+                     , rocksdb-haskell-ng
                      , cryptonite
                      , data-default
                      , exceptions
                      , lens
                      , log-warper
                      , memory
                      , mtl
+                     , random
+                     , time-units
                      , universum
   hs-source-dirs:      src
   default-language:    Haskell2010
@@ -88,6 +93,7 @@ executable disciplina-witness
                      , bytestring
                      , binary
                      , disciplina
+                     , cardano-sl-infra
                      , cardano-sl-networking
                      , formatting
                      , log-warper

diff --git a/src/Disciplina/Listeners/Listener.hs b/src/Disciplina/Listeners/Listener.hs
@@ -11,7 +11,7 @@ import           System.Wlog (logInfo, logWarning)
 import           Node
 import qualified Data.ByteString as BS
 
-import           Messages
+import           Disciplina.Messages
 
 
 

diff --git a/src/witness/Messages.hs → src/Disciplina/Messages.hs b/src/witness/Messages.hs → src/Disciplina/Messages.hs
@@ -1,7 +1,7 @@
 
 -- | Starting point for running a Witness node
 
-module Messages where
+module Disciplina.Messages where
 
 import Universum
 
@@ -11,20 +11,11 @@ import System.Wlog (logInfo, logWarning)
 
 import Disciplina.Launcher (BasicNodeParams (..), LoggingParams (..), bracketBasicNodeResources,
                             runBasicRealMode)
-import Params (WitnessParams (..), getWitnessParams)
 
-import qualified Network.Transport.TCP as TCP
 import           Node
 import           Data.Data (Data)
 import           Node.Message.Binary (BinaryP, binaryPacking)
-import qualified Data.ByteString.Char8 as B8
 import qualified Data.ByteString as BS
-import           System.Random
-import           Mockable.Concurrent (delay, forConcurrently, fork, killThread)
-import           Network.Transport.Abstract (closeTransport, Transport)
-import           Network.Transport.Concrete (concrete)
-import           Data.Time.Units (Microsecond, fromMicroseconds)
-import           System.IO (getChar)
 
 
 

diff --git a/src/Disciplina/Workers/Worker.hs b/src/Disciplina/Workers/Worker.hs
@@ -13,7 +13,7 @@ import           System.Random
 import           Mockable.Concurrent (delay, forConcurrently)
 import           Data.Time.Units (Microsecond, fromMicroseconds)
 
-import           Messages
+import           Disciplina.Messages
 
 
 

diff --git a/src/witness/Main.hs b/src/witness/Main.hs
@@ -15,6 +15,7 @@ import Disciplina.Workers
 import Params (WitnessParams (..), getWitnessParams)
 
 import qualified Network.Transport.TCP as TCP
+--import           Pos.Diffusion.Transport.TCP (bracketTransportTCP)
 import           Node
 import           Node.Message.Binary (binaryPacking)
 import qualified Data.ByteString.Char8 as B8
@@ -27,8 +28,6 @@ import           System.IO (getChar)
 
 
 
-
-
 main :: IO ()
 main = do
     WitnessParams {..} <- getWitnessParams
@@ -40,6 +39,10 @@ main = do
         basicParams = BasicNodeParams loggingParams
     runProduction . bracketBasicNodeResources basicParams $
         \nr -> runBasicRealMode nr $ do
+
+            --next to implement, use bracketTransportTCP
+            --bracketTransportTCP networkConnectionTimeout tcpAddr $ \transport ->
+
             let params = TCP.defaultTCPParameters { TCP.tcpCheckPeerHost = True }
             transport_ <- do
                 transportOrError <- liftIO $
@@ -51,6 +54,7 @@ main = do
             let prng1 = mkStdGen 0
             let prng2 = mkStdGen 1
 
+
             logInfo "Starting node"
             lift $ node (simpleNodeEndPoint transport) (const noReceiveDelay) (const noReceiveDelay)
                  prng1 binaryPacking (B8.pack "I am node 1") defaultNodeEnvironment $ \node1 ->

diff --git a/stack.yaml b/stack.yaml
@@ -1,5 +1,9 @@
 resolver: lts-9.1
 
+flags:
+  ether:
+    disable-tup-instances: true
+
 packages:
 - '.'
 - 'tools'
@@ -25,8 +29,10 @@ packages:
     commit: f8fd7cf811b40ddf8683f019b85179594ee78b38
   extra-dep: true
   subdirs:
+    - infra
     - networking
     - core
+    - db
     - binary
     - util
     - crypto
@@ -60,6 +66,17 @@ packages:
     commit: c8ea123947fb62e4e02ca46f0eaadc5b47da3605
   extra-dep: true
 
+# These two are needed for cardano-sl-infra
+- location:
+    git: https://github.com/input-output-hk/cardano-report-server.git
+    commit: 7b28613c9c3535193991712ff5a4a36a9f165570 # master v0.4.0
+  extra-dep: true
+
+- location:
+    git: https://github.com/input-output-hk/rocksdb-haskell-ng.git
+    commit: 100f24a8aa628bca57836f98f6b0c56406e59897
+  extra-dep: true
+
 - location:
     git: [email protected]:serokell/auth-data-structures.git
     commit: e4639c385595ae5544a017fac2d545ee0131f97d
@@ -69,6 +86,8 @@ nix:
     packages:
     - openssl
     - zlib
+    - lzma
+    - rocksdb
     - binutils
     - git
     - haskell.packages.ghc802.cpphs