@@ -10,25 +10,26 @@ import Universum
10
10
11
11
import Control.DeepSeq (force )
12
12
import Control.Monad.IO.Class (liftIO )
13
+ import Data.Bits
13
14
import qualified Data.ByteString.Lazy as LBS
15
+ import Data.Conduit.Combinators (yieldMany )
16
+ import Data.List.NonEmpty (NonEmpty ((:|) ))
17
+ import qualified Data.List.NonEmpty as NE
14
18
import Data.Semigroup ((<>) )
15
19
import Test.Hspec (Spec , describe , it , shouldBe )
16
20
17
- import Data.Bits
18
- import Data.List.NonEmpty (NonEmpty ((:|) ))
19
- import qualified Data.List.NonEmpty as NE
20
21
import qualified Network.Broadcast.OutboundQueue as OQ
21
22
import qualified Network.Broadcast.OutboundQueue.Types as OQ
22
23
import Network.Transport (Transport , closeTransport )
23
24
import qualified Network.Transport.InMemory as InMemory
24
25
import Node (NodeId )
25
26
import qualified Node
26
- import Pipes (each )
27
27
28
28
import Pos.Binary.Class (serialize' )
29
29
import Pos.Core.Block (Block , BlockHeader , HeaderHash ,
30
30
blockHeaderHash )
31
31
import qualified Pos.Core.Block as Block (getBlockHeader )
32
+ import Pos.Core.Chrono (NewestFirst (.. ), OldestFirst (.. ))
32
33
import Pos.Core.ProtocolConstants (ProtocolConstants (.. ))
33
34
import Pos.Core.Update (BlockVersion (.. ))
34
35
import Pos.Crypto (ProtocolMagic (.. ))
@@ -44,9 +45,8 @@ import Pos.Infra.Network.Types (Bucket (..))
44
45
import Pos.Infra.Reporting.Health.Types (HealthStatus (.. ))
45
46
import Pos.Logic.Pure (pureLogic )
46
47
import Pos.Logic.Types as Logic (Logic (.. ))
47
-
48
- import Pos.Core.Chrono (NewestFirst (.. ), OldestFirst (.. ))
49
48
import Pos.Util.Trace (wlogTrace )
49
+
50
50
import Test.Pos.Block.Arbitrary.Generate (generateMainBlock )
51
51
52
52
-- HLint warning disabled since I ran into https://ghc.haskell.org/trac/ghc/ticket/13106
@@ -104,7 +104,7 @@ serverLogic streamIORef arbitraryBlock arbitraryHashes arbitraryHeaders = pureLo
104
104
, getTipHeader = pure (Block. getBlockHeader arbitraryBlock)
105
105
, Logic. streamBlocks = \ _ -> do
106
106
bs <- readIORef streamIORef
107
- each $ map serializedBlock bs
107
+ yieldMany $ map serializedBlock bs
108
108
}
109
109
110
110
serializedBlock :: Block -> SerializedBlock
0 commit comments