resource-registry

IntersectMBO · Jun 21, 2024 · 4f8aebf · 4f8aebf
1 parent bee8628
commit 4f8aebf
Show file tree

Hide file tree

Showing 94 changed files with 990 additions and 414 deletions.
diff --git a/cabal.project b/cabal.project
@@ -20,6 +20,7 @@ index-state:
 
 packages:
   nf-vars
+  resource-registry
   ouroboros-consensus
   ouroboros-consensus-cardano
   ouroboros-consensus-protocol

diff --git a/nf-vars/src/Control/Concurrent/Class/MonadSTM/NormalForm.hs b/nf-vars/src/Control/Concurrent/Class/MonadSTM/NormalForm.hs
@@ -1,13 +1,13 @@
 module Control.Concurrent.Class.MonadSTM.NormalForm (
-      module Control.Concurrent.Class.MonadSTM.NormalForm.SVar
-    , module Control.Concurrent.Class.MonadSTM.NormalForm.TVar
-    , module Control.Concurrent.Class.MonadSTM.Strict.TBQueue
-    , module Control.Concurrent.Class.MonadSTM.Strict.TQueue
-    , module Control.Concurrent.Class.MonadSTM.Strict.TMVar
-) where
+    module Control.Concurrent.Class.MonadSTM.NormalForm.SVar
+  , module Control.Concurrent.Class.MonadSTM.NormalForm.TVar
+  , module Control.Concurrent.Class.MonadSTM.Strict.TBQueue
+  , module Control.Concurrent.Class.MonadSTM.Strict.TMVar
+  , module Control.Concurrent.Class.MonadSTM.Strict.TQueue
+  ) where
 
-import Control.Concurrent.Class.MonadSTM.NormalForm.SVar
-import Control.Concurrent.Class.MonadSTM.NormalForm.TVar
-import Control.Concurrent.Class.MonadSTM.Strict.TBQueue
-import Control.Concurrent.Class.MonadSTM.Strict.TQueue
-import Control.Concurrent.Class.MonadSTM.Strict.TMVar
+import           Control.Concurrent.Class.MonadSTM.NormalForm.SVar
+import           Control.Concurrent.Class.MonadSTM.NormalForm.TVar
+import           Control.Concurrent.Class.MonadSTM.Strict.TBQueue
+import           Control.Concurrent.Class.MonadSTM.Strict.TMVar
+import           Control.Concurrent.Class.MonadSTM.Strict.TQueue
diff --git a/nf-vars/test/Main.hs b/nf-vars/test/Main.hs
@@ -6,12 +6,12 @@
 
 module Main (main) where
 
+import           Control.Concurrent.Class.MonadSTM (MonadSTM)
+import           Control.Concurrent.Class.MonadSTM.NormalForm (newSVar,
+                     updateSVar)
 import           Control.Monad.IOSim
 import           GHC.Generics
 import           NoThunks.Class
-import           Control.Concurrent.Class.MonadSTM.NormalForm (
-                     newSVar, updateSVar)
-import           Control.Concurrent.Class.MonadSTM (MonadSTM)
 import           Test.Tasty
 import           Test.Tasty.QuickCheck
 

diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal
@@ -554,6 +554,7 @@ library unstable-cardano-tools
     ouroboros-network-api,
     ouroboros-network-framework ^>=0.13.2,
     ouroboros-network-protocols,
+    resource-registry ^>=0.1,
     serialise ^>=0.2,
     singletons,
     sop-core,

diff --git a/...os-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs b/...os-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs
@@ -4,7 +4,6 @@
 {-# LANGUAGE PatternSynonyms          #-}
 {-# LANGUAGE StandaloneKindSignatures #-}
 {-# LANGUAGE TypeOperators            #-}
-{-# LANGUAGE ViewPatterns             #-}
 
 module Ouroboros.Consensus.Cardano.Block (
     -- * Eras

diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Analysis.hs b/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Analysis.hs
@@ -35,6 +35,7 @@ import qualified Cardano.Tools.DBAnalyser.HasAnalysis as HasAnalysis
 import           Codec.CBOR.Encoding (Encoding)
 import           Control.Monad (unless, void, when)
 import           Control.Monad.Except (runExcept)
+import           Control.ResourceRegistry
 import           Control.Tracer (Tracer (..), nullTracer, traceWith)
 import           Data.Int (Int64)
 import           Data.List (intercalate)
@@ -73,7 +74,6 @@ import           Ouroboros.Consensus.Storage.LedgerDB (DiskSnapshot (..),
 import           Ouroboros.Consensus.Storage.Serialisation (SizeInBytes,
                      encodeDisk)
 import qualified Ouroboros.Consensus.Util.IOLike as IOLike
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import           System.FS.API (SomeHasFS (..))
 import qualified System.IO as IO
 

diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Run.hs b/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Run.hs
@@ -12,6 +12,7 @@ import           Cardano.Tools.DBAnalyser.HasAnalysis
 import           Cardano.Tools.DBAnalyser.Types
 import           Codec.Serialise (Serialise (decode))
 import           Control.Monad.Except (runExceptT)
+import           Control.ResourceRegistry
 import           Control.Tracer (Tracer (..), nullTracer)
 import           Data.Singletons (Sing, SingI (..))
 import qualified Debug.Trace as Debug
@@ -32,7 +33,6 @@ import           Ouroboros.Consensus.Storage.LedgerDB (DiskSnapshot (..),
                      readSnapshot)
 import           Ouroboros.Consensus.Util.IOLike
 import           Ouroboros.Consensus.Util.Orphans ()
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import           System.IO
 
 

diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBImmutaliser/Run.hs b/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBImmutaliser/Run.hs
@@ -19,6 +19,7 @@ module Cardano.Tools.DBImmutaliser.Run (
 
 import qualified Cardano.Tools.DBAnalyser.Block.Cardano as Cardano
 import           Cardano.Tools.DBAnalyser.HasAnalysis (mkProtocolInfo)
+import           Control.ResourceRegistry
 import           Control.Tracer (Tracer, stdoutTracer, traceWith)
 import           Data.Foldable (for_)
 import           Data.Functor.Contravariant ((>$<))
@@ -44,7 +45,6 @@ import qualified Ouroboros.Consensus.Storage.VolatileDB.API as VolatileDB
 import qualified Ouroboros.Consensus.Storage.VolatileDB.Impl as VolatileDB
 import           Ouroboros.Consensus.Util.Args
 import           Ouroboros.Consensus.Util.IOLike
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import           Ouroboros.Network.Block (MaxSlotNo)
 import           System.FS.API (SomeHasFS (..))
 import           System.FS.API.Types (MountPoint (..))

diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBSynthesizer/Run.hs b/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBSynthesizer/Run.hs
@@ -15,6 +15,7 @@ import           Cardano.Tools.DBSynthesizer.Types
 import           Control.Monad.Trans.Except (ExceptT)
 import           Control.Monad.Trans.Except.Extra (firstExceptT,
                      handleIOExceptT, hoistEither, runExceptT)
+import           Control.ResourceRegistry
 import           Control.Tracer (nullTracer)
 import           Data.Aeson as Aeson (FromJSON, Result (..), Value,
                      eitherDecodeFileStrict', eitherDecodeStrict', fromJSON)
@@ -34,7 +35,6 @@ import qualified Ouroboros.Consensus.Storage.ChainDB as ChainDB (getTipPoint)
 import qualified Ouroboros.Consensus.Storage.ChainDB.Impl as ChainDB (withDB)
 import qualified Ouroboros.Consensus.Storage.ChainDB.Impl.Args as ChainDB
 import           Ouroboros.Consensus.Util.IOLike (atomically)
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import           Ouroboros.Network.Block
 import           Ouroboros.Network.Point (WithOrigin (..))
 import           System.Directory

diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBTruncater/Run.hs b/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBTruncater/Run.hs
@@ -11,6 +11,7 @@ import           Cardano.Slotting.Slot (WithOrigin (..))
 import           Cardano.Tools.DBAnalyser.HasAnalysis
 import           Cardano.Tools.DBTruncater.Types
 import           Control.Monad
+import           Control.ResourceRegistry (runWithTempRegistry, withRegistry)
 import           Control.Tracer
 import           Data.Functor.Identity
 import           Data.Traversable (for)
@@ -24,8 +25,6 @@ import           Ouroboros.Consensus.Storage.ImmutableDB (ImmutableDB, Iterator,
 import qualified Ouroboros.Consensus.Storage.ImmutableDB as ImmutableDB
 import           Ouroboros.Consensus.Storage.ImmutableDB.Impl
 import           Ouroboros.Consensus.Util.IOLike
-import           Ouroboros.Consensus.Util.ResourceRegistry (runWithTempRegistry,
-                     withRegistry)
 import           Prelude hiding (truncate)
 import           System.IO
 

diff --git a/...boros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/ImmDBServer/Diffusion.hs b/...boros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/ImmDBServer/Diffusion.hs
@@ -6,6 +6,7 @@
 module Cardano.Tools.ImmDBServer.Diffusion (run) where
 
 import           Cardano.Tools.ImmDBServer.MiniProtocols (immDBServer)
+import           Control.ResourceRegistry
 import           Control.Tracer
 import qualified Data.ByteString.Lazy as BL
 import           Data.Functor.Contravariant ((>$<))
@@ -22,7 +23,6 @@ import           Ouroboros.Consensus.Storage.ImmutableDB (ImmutableDbArgs (..))
 import qualified Ouroboros.Consensus.Storage.ImmutableDB as ImmutableDB
 import           Ouroboros.Consensus.Util
 import           Ouroboros.Consensus.Util.IOLike
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import           Ouroboros.Network.ErrorPolicy (nullErrorPolicies)
 import           Ouroboros.Network.IOManager (withIOManager)
 import           Ouroboros.Network.Mux

diff --git a/...s-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/ImmDBServer/MiniProtocols.hs b/...s-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/ImmDBServer/MiniProtocols.hs
@@ -16,6 +16,7 @@ module Cardano.Tools.ImmDBServer.MiniProtocols (immDBServer) where
 import qualified Codec.CBOR.Decoding as CBOR
 import qualified Codec.CBOR.Encoding as CBOR
 import           Control.Monad (forever)
+import           Control.ResourceRegistry
 import           Control.Tracer
 import           Data.Bifunctor (bimap)
 import qualified Data.ByteString.Lazy as BL
@@ -40,7 +41,6 @@ import           Ouroboros.Consensus.Storage.ImmutableDB.API (ImmutableDB)
 import qualified Ouroboros.Consensus.Storage.ImmutableDB.API as ImmutableDB
 import           Ouroboros.Consensus.Util
 import           Ouroboros.Consensus.Util.IOLike
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import           Ouroboros.Network.Block (ChainUpdate (..), Tip (..))
 import           Ouroboros.Network.Driver (runPeer)
 import           Ouroboros.Network.KeepAlive (keepAliveServer)

diff --git a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal
@@ -86,15 +86,16 @@ library
     filepath,
     fs-api ^>=0.2.0.1,
     hashable,
-    nf-vars,
     io-classes ^>=1.5,
     mtl,
+    nf-vars ^>=0.1,
     ouroboros-consensus ^>=0.19,
     ouroboros-network ^>=0.16,
     ouroboros-network-api ^>=0.7.3,
     ouroboros-network-framework ^>=0.13.2,
     ouroboros-network-protocols ^>=0.9,
     random,
+    resource-registry ^>=0.1,
     safe-wild-cards ^>=1.0,
     serialise ^>=0.2,
     si-timers ^>=1.5,
@@ -148,6 +149,7 @@ library unstable-diffusion-testlib
     ouroboros-network-protocols,
     quiet ^>=0.2,
     random,
+    resource-registry,
     si-timers,
     sop-core ^>=0.5,
     sop-extras ^>=0.2,
@@ -297,6 +299,7 @@ test-suite consensus-test
     quickcheck-state-machine:no-vendored-treediff,
     quiet,
     random,
+    resource-registry,
     serialise,
     si-timers,
     sop-extras,

diff --git a/...s-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToClient.hs b/...s-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToClient.hs
@@ -30,6 +30,7 @@ import           Codec.CBOR.Decoding (Decoder)
 import           Codec.CBOR.Encoding (Encoding)
 import           Codec.CBOR.Read (DeserialiseFailure)
 import           Codec.Serialise (Serialise)
+import           Control.ResourceRegistry
 import           Control.Tracer
 import           Data.ByteString.Lazy (ByteString)
 import           Data.Void (Void)
@@ -52,7 +53,6 @@ import qualified Ouroboros.Consensus.Storage.ChainDB.API as ChainDB
 import           Ouroboros.Consensus.Util (ShowProxy)
 import           Ouroboros.Consensus.Util.IOLike
 import           Ouroboros.Consensus.Util.Orphans ()
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import qualified Ouroboros.Network.AnchoredFragment as AF
 import           Ouroboros.Network.Block (Serialised, decodePoint, decodeTip,
                      encodePoint, encodeTip)

diff --git a/...sus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs b/...sus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs
@@ -44,6 +44,7 @@ import           Codec.CBOR.Read (DeserialiseFailure)
 import           Control.Concurrent.Class.MonadSTM.Strict.TVar as TVar.Unchecked
 import           Control.Monad.Class.MonadTime.SI (MonadTime)
 import           Control.Monad.Class.MonadTimer.SI (MonadTimer)
+import           Control.ResourceRegistry
 import           Control.Tracer
 import           Data.ByteString.Lazy (ByteString)
 import qualified Data.ByteString.Lazy as BSL
@@ -71,7 +72,6 @@ import           Ouroboros.Consensus.Storage.Serialisation (SerialisedHeader)
 import           Ouroboros.Consensus.Util (ShowProxy)
 import           Ouroboros.Consensus.Util.IOLike
 import           Ouroboros.Consensus.Util.Orphans ()
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import           Ouroboros.Network.Block (Serialised (..), decodePoint,
                      decodeTip, encodePoint, encodeTip)
 import           Ouroboros.Network.BlockFetch

diff --git a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs
@@ -63,6 +63,7 @@ import           Control.DeepSeq (NFData)
 import           Control.Monad (when)
 import           Control.Monad.Class.MonadTime.SI (MonadTime)
 import           Control.Monad.Class.MonadTimer.SI (MonadTimer)
+import           Control.ResourceRegistry
 import           Control.Tracer (Tracer, contramap, traceWith)
 import           Data.ByteString.Lazy (ByteString)
 import           Data.Functor.Contravariant (Predicate (..))
@@ -107,7 +108,6 @@ import           Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy
 import           Ouroboros.Consensus.Util.Args
 import           Ouroboros.Consensus.Util.IOLike
 import           Ouroboros.Consensus.Util.Orphans ()
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import           Ouroboros.Consensus.Util.Time (secondsToNominalDiffTime)
 import           Ouroboros.Network.BlockFetch (BlockFetchConfiguration (..))
 import qualified Ouroboros.Network.Diffusion as Diffusion

diff --git a/...ensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node/ErrorPolicy.hs b/...ensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node/ErrorPolicy.hs
@@ -3,6 +3,8 @@
 module Ouroboros.Consensus.Node.ErrorPolicy (consensusErrorPolicy) where
 
 import           Control.Monad.Class.MonadAsync (ExceptionInLinkedThread (..))
+import           Control.ResourceRegistry (RegistryClosedException,
+                     ResourceRegistryThreadException, TempRegistryException)
 import           Data.Proxy (Proxy)
 import           Data.Time.Clock (DiffTime)
 import           Data.Typeable (Typeable)
@@ -20,9 +22,6 @@ import           Ouroboros.Consensus.Storage.ImmutableDB.API (ImmutableDBError)
 import qualified Ouroboros.Consensus.Storage.ImmutableDB.API as ImmutableDB
 import           Ouroboros.Consensus.Storage.VolatileDB.API (VolatileDBError)
 import qualified Ouroboros.Consensus.Storage.VolatileDB.API as VolatileDB
-import           Ouroboros.Consensus.Util.ResourceRegistry
-                     (RegistryClosedException, ResourceRegistryThreadException,
-                     TempRegistryException)
 import           Ouroboros.Network.ErrorPolicy
 import           System.FS.API.Types (FsError)
 

diff --git a/...ros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node/GSM.hs b/...ros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node/GSM.hs
@@ -27,6 +27,8 @@ module Ouroboros.Consensus.Node.GSM (
   ) where
 
 import qualified Cardano.Slotting.Slot as Slot
+import           Control.Concurrent.Class.MonadSTM.NormalForm (StrictTVar)
+import qualified Control.Concurrent.Class.MonadSTM.NormalForm as StrictSTM
 import qualified Control.Concurrent.Class.MonadSTM.TVar as LazySTM
 import           Control.Monad (forever, join, unless)
 import           Control.Monad.Class.MonadSTM (MonadSTM, STM, atomically, check,
@@ -44,8 +46,6 @@ import qualified Ouroboros.Consensus.HardFork.History as HardFork
 import qualified Ouroboros.Consensus.HardFork.History.Qry as Qry
 import qualified Ouroboros.Consensus.Ledger.Basics as L
 import           Ouroboros.Consensus.Storage.ChainDB.API (ChainDB)
-import           Control.Concurrent.Class.MonadSTM.NormalForm (StrictTVar)
-import qualified Control.Concurrent.Class.MonadSTM.NormalForm as StrictSTM
 import           Ouroboros.Network.PeerSelection.LedgerPeers.Type
                      (LedgerStateJudgement (..))
 import           System.FS.API (HasFS, createDirectoryIfMissing, doesFileExist,

diff --git a/...sus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node/RethrowPolicy.hs b/...sus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node/RethrowPolicy.hs
@@ -3,6 +3,8 @@
 module Ouroboros.Consensus.Node.RethrowPolicy (consensusRethrowPolicy) where
 
 import           Control.Monad.Class.MonadAsync (ExceptionInLinkedThread (..))
+import           Control.ResourceRegistry (RegistryClosedException,
+                     ResourceRegistryThreadException, TempRegistryException)
 import           Data.Proxy (Proxy)
 import           Data.Typeable (Typeable)
 import           Ouroboros.Consensus.Block (StandardHash)
@@ -19,9 +21,6 @@ import           Ouroboros.Consensus.Storage.ImmutableDB.API (ImmutableDBError)
 import qualified Ouroboros.Consensus.Storage.ImmutableDB.API as ImmutableDB
 import           Ouroboros.Consensus.Storage.VolatileDB.API (VolatileDBError)
 import qualified Ouroboros.Consensus.Storage.VolatileDB.API as VolatileDB
-import           Ouroboros.Consensus.Util.ResourceRegistry
-                     (RegistryClosedException, ResourceRegistryThreadException,
-                     TempRegistryException)
 import           Ouroboros.Network.RethrowPolicy
 import           System.FS.API.Types (FsError)
 

diff --git a/...s-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/NodeKernel.hs b/...s-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/NodeKernel.hs
@@ -34,6 +34,7 @@ import           Control.DeepSeq (force)
 import           Control.Monad
 import qualified Control.Monad.Class.MonadTimer.SI as SI
 import           Control.Monad.Except
+import           Control.ResourceRegistry
 import           Control.Tracer
 import           Data.Bifunctor (second)
 import           Data.Data (Typeable)
@@ -81,7 +82,6 @@ import           Ouroboros.Consensus.Util.AnchoredFragment
 import           Ouroboros.Consensus.Util.EarlyExit
 import           Ouroboros.Consensus.Util.IOLike
 import           Ouroboros.Consensus.Util.Orphans ()
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import           Ouroboros.Consensus.Util.STM
 import           Ouroboros.Network.AnchoredFragment (AnchoredFragment,
                      AnchoredSeq (..))

diff --git a/ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Network.hs b/ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Network.hs
@@ -43,6 +43,7 @@ import           Control.Monad
 import           Control.Monad.Class.MonadTime.SI (MonadTime)
 import           Control.Monad.Class.MonadTimer.SI (MonadTimer)
 import qualified Control.Monad.Except as Exc
+import           Control.ResourceRegistry
 import           Control.Tracer
 import qualified Data.ByteString.Lazy as Lazy
 import           Data.Either (isRight)
@@ -96,7 +97,6 @@ import           Ouroboros.Consensus.Util.Enclose (pattern FallingEdge)
 import           Ouroboros.Consensus.Util.IOLike
 import           Ouroboros.Consensus.Util.Orphans ()
 import           Ouroboros.Consensus.Util.RedundantConstraints
-import           Ouroboros.Consensus.Util.ResourceRegistry
 import           Ouroboros.Consensus.Util.STM
 import           Ouroboros.Consensus.Util.Time
 import qualified Ouroboros.Network.AnchoredFragment as AF

diff --git a/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/Genesis/Setup/GenChains.hs b/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/Genesis/Setup/GenChains.hs
@@ -28,18 +28,17 @@ import           Ouroboros.Network.Protocol.ChainSync.Codec
                      (ChainSyncTimeout (..))
 import           Ouroboros.Network.Protocol.Limits (shortWait)
 import qualified Test.Consensus.BlockTree as BT
-import           Test.Consensus.PointSchedule
 import qualified Test.Consensus.ChainGenerator.Adversarial as A
-import           Test.Consensus.ChainGenerator.Adversarial
-                     (genPrefixBlockCount)
-import           Test.Consensus.ChainGenerator.Counting
-                     (Count (Count), getVector)
+import           Test.Consensus.ChainGenerator.Adversarial (genPrefixBlockCount)
+import           Test.Consensus.ChainGenerator.Counting (Count (Count),
+                     getVector)
 import qualified Test.Consensus.ChainGenerator.Honest as H
 import           Test.Consensus.ChainGenerator.Honest
                      (ChainSchema (ChainSchema), HonestRecipe (..))
 import           Test.Consensus.ChainGenerator.Params
 import qualified Test.Consensus.ChainGenerator.Slot as S
 import           Test.Consensus.ChainGenerator.Slot (S)
+import           Test.Consensus.PointSchedule
 import qualified Test.QuickCheck as QC
 import           Test.QuickCheck.Extras (unsafeMapSuchThatJust)
 import           Test.QuickCheck.Random (QCGen)

diff --git a/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/Genesis/Tests/Uniform.hs b/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/Genesis/Tests/Uniform.hs
@@ -33,6 +33,7 @@ import           Ouroboros.Network.Protocol.ChainSync.Codec
                      (ChainSyncTimeout (..))
 import           Ouroboros.Network.Protocol.Limits (shortWait)
 import           Test.Consensus.BlockTree (BlockTree (..), btbSuffix)
+import           Test.Consensus.ChainGenerator.Params (Delta (Delta))
 import           Test.Consensus.Genesis.Setup
 import           Test.Consensus.Genesis.Setup.Classifiers
 import           Test.Consensus.PeerSimulator.ChainSync (chainSyncNoTimeouts)
@@ -46,7 +47,6 @@ import           Test.Consensus.PointSchedule.Shrinking
                      (shrinkByRemovingAdversaries, shrinkPeerSchedules)
 import           Test.Consensus.PointSchedule.SinglePeer
                      (SchedulePoint (ScheduleBlockPoint, ScheduleTipPoint))
-import           Test.Consensus.ChainGenerator.Params (Delta (Delta))
 import qualified Test.QuickCheck as QC
 import           Test.QuickCheck
 import           Test.Tasty