Skip to content

Commit 11d833b

Browse files
committed
tx-submission: compile with ghc < 9.10
1 parent 8a78586 commit 11d833b

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission/TxLogic.hs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE BangPatterns #-}
23
{-# LANGUAGE BlockArguments #-}
34
{-# LANGUAGE DeriveGeneric #-}
@@ -18,7 +19,11 @@ import Prelude hiding (seq)
1819

1920
import Control.Exception (assert)
2021

21-
import Data.Foldable as Foldable (fold, toList)
22+
import Data.Foldable (fold,
23+
#if !MIN_VERSION_base(4,20,0)
24+
foldl',
25+
#endif
26+
toList)
2227
import Data.List (intercalate, isPrefixOf, isSuffixOf, mapAccumR, nub,
2328
stripPrefix)
2429
import Data.Map.Merge.Strict qualified as Map

ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/Registry.hs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE BangPatterns #-}
23
{-# LANGUAGE BlockArguments #-}
34
{-# LANGUAGE LambdaCase #-}
@@ -21,7 +22,11 @@ import Control.Monad.Class.MonadFork
2122
import Control.Monad.Class.MonadThrow
2223
import Control.Monad.Class.MonadTimer.SI
2324

24-
import Data.Foldable (traverse_)
25+
import Data.Foldable (traverse_
26+
#if !MIN_VERSION_base(4,20,0)
27+
, foldl'
28+
#endif
29+
)
2530
import Data.Map.Strict (Map)
2631
import Data.Map.Strict qualified as Map
2732
import Data.Maybe (fromMaybe)

ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/State.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import Control.Exception (assert)
2828
import Control.Tracer (Tracer, traceWith)
2929

3030
import Data.Foldable (fold,
31-
#if MIN_VERSION_base(4,20,0)
31+
#if !MIN_VERSION_base(4,20,0)
3232
foldl',
3333
#endif
3434
toList)

scripts/ci/check-stylish-ignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
*/Setup.hs
2-
ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/State.hs
2+
ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/TxLogic.hs
33
ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs
4+
ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/Registry.hs
5+
ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/State.hs
46
network-mux/src/Network/Mux/TCPInfo.hs
57
network-mux/src/Network/Mux/Bearer.hs
68
network-mux/src/Network/Mux/Bearer/Pipe.hs

0 commit comments

Comments
 (0)