tx-submission: compile with ghc < 9.10

IntersectMBO · Sep 18, 2024 · 11d833b · 11d833b
1 parent 8a78586
commit 11d833b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission/TxLogic.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission/TxLogic.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE BangPatterns        #-}
 {-# LANGUAGE BlockArguments      #-}
 {-# LANGUAGE DeriveGeneric       #-}
@@ -18,7 +19,11 @@ import Prelude hiding (seq)
 
 import Control.Exception (assert)
 
-import Data.Foldable as Foldable (fold, toList)
+import Data.Foldable (fold,
+#if !MIN_VERSION_base(4,20,0)
+         foldl',
+#endif
+         toList)
 import Data.List (intercalate, isPrefixOf, isSuffixOf, mapAccumR, nub,
            stripPrefix)
 import Data.Map.Merge.Strict qualified as Map

diff --git a/ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/Registry.hs b/ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/Registry.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE BangPatterns        #-}
 {-# LANGUAGE BlockArguments      #-}
 {-# LANGUAGE LambdaCase          #-}
@@ -21,7 +22,11 @@ import Control.Monad.Class.MonadFork
 import Control.Monad.Class.MonadThrow
 import Control.Monad.Class.MonadTimer.SI
 
-import Data.Foldable (traverse_)
+import Data.Foldable (traverse_
+#if !MIN_VERSION_base(4,20,0)
+                     , foldl'
+#endif
+                     )
 import Data.Map.Strict (Map)
 import Data.Map.Strict qualified as Map
 import Data.Maybe (fromMaybe)

diff --git a/ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/State.hs b/ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/State.hs
@@ -28,7 +28,7 @@ import Control.Exception (assert)
 import Control.Tracer (Tracer, traceWith)
 
 import Data.Foldable (fold,
-#if MIN_VERSION_base(4,20,0)
+#if !MIN_VERSION_base(4,20,0)
          foldl',
 #endif
          toList)

diff --git a/scripts/ci/check-stylish-ignore b/scripts/ci/check-stylish-ignore
@@ -1,6 +1,8 @@
 */Setup.hs
-ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/State.hs
+ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/TxLogic.hs
 ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs
+ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/Registry.hs
+ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound/State.hs
 network-mux/src/Network/Mux/TCPInfo.hs
 network-mux/src/Network/Mux/Bearer.hs
 network-mux/src/Network/Mux/Bearer/Pipe.hs