Skip to content

Commit

Permalink
Fix build in master
Browse files Browse the repository at this point in the history
  • Loading branch information
flyingleafe committed Apr 8, 2018
1 parent 23d9dde commit 941689d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
6 changes: 5 additions & 1 deletion disciplina.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ library
, Disciplina.Launcher
, Disciplina.Listeners
, Disciplina.Workers
, Disciplina.Transport
other-modules:
Disciplina.Accounts
, Disciplina.Accounts.Account
Expand All @@ -30,6 +31,8 @@ library
, Disciplina.Launcher.Runner
, Disciplina.Listeners.Listener
, Disciplina.Workers.Worker
, Disciplina.Transport.TCP
, Disciplina.Messages
-- other-extensions:
build-depends: base >=4.9 && <4.10
, AVL
Expand All @@ -40,12 +43,14 @@ library
, cryptonite
, data-default
, exceptions
, formatting
, hashable
, lens
, log-warper
, memory
, mtl
, network-transport
, network-transport-tcp
, random
, stm
, time-units
Expand Down Expand Up @@ -80,7 +85,6 @@ library
ViewPatterns

ghc-options: -Wall
-Werror
-fno-warn-orphans

executable disciplina-witness
Expand Down
2 changes: 1 addition & 1 deletion src/Disciplina/Messages.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Universum
import Data.Binary (Binary)
import qualified Data.ByteString as BS
import Data.Data (Data)
import Node (Message, messageCode, formatMessage)
import Node (Message, formatMessage, messageCode)
import Node.Message.Binary (BinaryP, binaryPacking)


Expand Down
4 changes: 4 additions & 0 deletions src/Disciplina/Transport.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

module Disciplina.Transport (module M) where

import Disciplina.Transport.TCP as M
6 changes: 3 additions & 3 deletions src/witness/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ import System.Wlog (logInfo, logWarning)
import Disciplina.Launcher (BasicNodeParams (..), LoggingParams (..), bracketBasicNodeResources,
runBasicRealMode)
import Disciplina.Listeners (witnessListeners)
import Disciplina.Transport (bracketTransportTCP)
import Disciplina.Workers (witnessWorkers)
import Disciplina.Transport.TCP (bracketTransportTCP)
import Params (WitnessParams (..), getWitnessParams)

import qualified Data.ByteString as BS
import qualified Data.ByteString.Char8 as B8
import Mockable.Concurrent (fork)
import qualified Network.Transport.TCP as TCP
import Node (NodeAction(..), nodeId, noReceiveDelay, simpleNodeEndPoint,
node, defaultNodeEnvironment)
import Node (NodeAction (..), defaultNodeEnvironment, noReceiveDelay, node, nodeId,
simpleNodeEndPoint)
import Node.Message.Binary (binaryPacking)
import System.IO (getChar)
import System.Random (mkStdGen)
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ ghc-options:
cardano-sl-networking: -fno-warn-redundant-constraints

nix:
packages: [rocksdb]
packages: [rocksdb, haskellPackages.cpphs]

0 comments on commit 941689d

Please sign in to comment.