ouroboros-network-{api,mock} packages

* `ouroboros-network-mock` contains a testing chain. * `ouroboros-network-api` contains shared api between various `ouroboros-network*` packages and the `ouroboros-consensus` package.
IntersectMBO · Dec 2, 2022 · 197e370 · 197e370
1 parent 42bbefb
commit 197e370
Show file tree

Hide file tree

Showing 128 changed files with 1,120 additions and 871 deletions.
diff --git a/cabal.project b/cabal.project
@@ -20,10 +20,12 @@ index-state: cardano-haskell-packages 2022-11-15T00:00:00Z
 packages: ./ouroboros-network-testing
           ./monoidal-synchronisation
           ./network-mux
-          ./ouroboros-network-testing
+          ./ouroboros-network
+          ./ouroboros-network-api
           ./ouroboros-network-framework
+          ./ouroboros-network-mock
           ./ouroboros-network-protocols
-          ./ouroboros-network
+          ./ouroboros-network-testing
           ./ouroboros-consensus
           ./ouroboros-consensus-byron
           ./ouroboros-consensus-byron-test

diff --git a/cardano-client/cardano-client.cabal b/cardano-client/cardano-client.cabal
@@ -22,6 +22,7 @@ library
                        bytestring        >=0.10 && <0.12,
                        containers,
                        io-classes,
+                       ouroboros-network-api,
                        ouroboros-network,
                        ouroboros-network-framework,
                        ouroboros-consensus-diffusion,

diff --git a/cardano-client/src/Cardano/Client/Subscription.hs b/cardano-client/src/Cardano/Client/Subscription.hs
@@ -30,9 +30,10 @@ import           Data.Void (Void)
 
 import           Network.Mux.Trace (MuxTrace, WithMuxBearer)
 
+import           Ouroboros.Network.ControlMessage (ControlMessage (..))
 import           Ouroboros.Network.Magic (NetworkMagic)
-import           Ouroboros.Network.Mux (ControlMessage (..), MuxMode (..),
-                     MuxPeer (..), OuroborosApplication, RunMiniProtocol (..))
+import           Ouroboros.Network.Mux (MuxMode (..), MuxPeer (..),
+                     OuroborosApplication, RunMiniProtocol (..))
 import           Ouroboros.Network.NodeToClient (ClientSubscriptionParams (..),
                      ConnectionId, LocalAddress,
                      NetworkClientSubcriptionTracers,

diff --git a/ouroboros-consensus-byron-test/ouroboros-consensus-byron-test.cabal b/ouroboros-consensus-byron-test/ouroboros-consensus-byron-test.cabal
@@ -49,6 +49,8 @@ library
 
                      , byron-spec-ledger
 
+                     , ouroboros-network-api
+                     , ouroboros-network-mock
                      , ouroboros-network-protocols
                      , ouroboros-consensus
                      , ouroboros-consensus-test
@@ -100,7 +102,7 @@ test-suite test
                      , small-steps
                      , small-steps-test
 
-                     , ouroboros-network-protocols
+                     , ouroboros-network-mock
                      , ouroboros-consensus
                      , ouroboros-consensus-test
                      , ouroboros-consensus-byron

diff --git a/ouroboros-consensus-byron-test/test/Test/ThreadNet/Byron.hs b/ouroboros-consensus-byron-test/test/Test/ThreadNet/Byron.hs
@@ -33,8 +33,8 @@ import           Test.Tasty.QuickCheck
 
 import           Cardano.Crypto.Seed (mkSeedFromBytes)
 
-import           Ouroboros.Network.MockChain.Chain (Chain)
-import qualified Ouroboros.Network.MockChain.Chain as Chain
+import           Ouroboros.Network.Mock.Chain (Chain)
+import qualified Ouroboros.Network.Mock.Chain as Chain
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.BlockchainTime

diff --git a/ouroboros-consensus-byron/ouroboros-consensus-byron.cabal b/ouroboros-consensus-byron/ouroboros-consensus-byron.cabal
@@ -64,7 +64,7 @@ library
                      , nothunks
                      , text              >=1.2   && <1.3
 
-                     , ouroboros-network
+                     , ouroboros-network-api
                      , ouroboros-network-protocols
                      , ouroboros-consensus
 

diff --git a/ouroboros-consensus-byron/src/Ouroboros/Consensus/Byron/Ledger/Block.hs b/ouroboros-consensus-byron/src/Ouroboros/Consensus/Byron/Ledger/Block.hs
@@ -51,7 +51,7 @@ import qualified Cardano.Chain.Byron.API as CC
 import qualified Cardano.Chain.Slotting as CC
 import qualified Cardano.Crypto.Hashing as CC
 
-import           Ouroboros.Network.DeltaQ (SizeInBytes)
+import           Ouroboros.Network.SizeInBytes (SizeInBytes)
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Util (ShowProxy (..))

diff --git a/ouroboros-consensus-byron/src/Ouroboros/Consensus/Byron/Ledger/Serialisation.hs b/ouroboros-consensus-byron/src/Ouroboros/Consensus/Byron/Ledger/Serialisation.hs
@@ -51,7 +51,7 @@ import           Cardano.Binary
 import qualified Cardano.Chain.Block as CC
 import qualified Cardano.Chain.Slotting as CC
 
-import           Ouroboros.Network.DeltaQ (SizeInBytes)
+import           Ouroboros.Network.SizeInBytes (SizeInBytes)
 
 import           Ouroboros.Consensus.Block
 

diff --git a/ouroboros-consensus-cardano-test/ouroboros-consensus-cardano-test.cabal b/ouroboros-consensus-cardano-test/ouroboros-consensus-cardano-test.cabal
@@ -53,6 +53,7 @@ library
                      , cardano-ledger-shelley-test
                      , cardano-protocol-tpraos
 
+                     , ouroboros-network-api
                      , ouroboros-network-protocols
                      , ouroboros-consensus
                      , ouroboros-consensus-test
@@ -107,6 +108,7 @@ test-suite test
                      , cardano-ledger-shelley
                      , cardano-protocol-tpraos
 
+                     , ouroboros-network-api
                      , ouroboros-network-protocols
                      , ouroboros-consensus
                      , ouroboros-consensus-test

diff --git a/ouroboros-consensus-cardano-tools/ouroboros-consensus-cardano-tools.cabal b/ouroboros-consensus-cardano-tools/ouroboros-consensus-cardano-tools.cabal
@@ -76,6 +76,7 @@ library
                      , ouroboros-consensus-cardano
                      , ouroboros-consensus-protocol
                      , ouroboros-consensus-shelley
+                     , ouroboros-network-api
                      , ouroboros-network-protocols
                      , ouroboros-consensus-diffusion
 

diff --git a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal
@@ -89,6 +89,7 @@ library
 
                      , io-classes       ^>=0.3
                      , typed-protocols
+                     , ouroboros-network-api ^>=0.1
                      , ouroboros-network-framework ^>=0.2
                      , ouroboros-network-protocols ^>=0.2
                      , ouroboros-network ^>=0.2

diff --git a/ouroboros-consensus-diffusion/src/Ouroboros/Consensus/Network/NodeToNode.hs b/ouroboros-consensus-diffusion/src/Ouroboros/Consensus/Network/NodeToNode.hs
@@ -64,6 +64,7 @@ import           Ouroboros.Network.Driver.Limits
 import           Ouroboros.Network.KeepAlive
 import           Ouroboros.Network.Mux
 import           Ouroboros.Network.NodeToNode
+import           Ouroboros.Network.NodeToNode.Version (isPipeliningEnabled)
 import           Ouroboros.Network.PeerSelection.PeerMetric.Type
                      (FetchedMetricsTracer, HeaderMetricsTracer,
                      ReportPeerMetrics (..))

diff --git a/ouroboros-consensus-mock-test/ouroboros-consensus-mock-test.cabal b/ouroboros-consensus-mock-test/ouroboros-consensus-mock-test.cabal
@@ -72,6 +72,7 @@ test-suite test
                      , tasty-quickcheck
 
                      , ouroboros-network-protocols
+                     , ouroboros-network-mock
                      , ouroboros-consensus
                      , ouroboros-consensus-mock
                      , ouroboros-consensus-mock-test

diff --git a/ouroboros-consensus-mock-test/test/Test/ThreadNet/PBFT.hs b/ouroboros-consensus-mock-test/test/Test/ThreadNet/PBFT.hs
@@ -11,7 +11,7 @@ import           Test.QuickCheck
 import           Test.Tasty
 import           Test.Tasty.QuickCheck
 
-import           Ouroboros.Network.MockChain.Chain (foldChain)
+import           Ouroboros.Network.Mock.Chain (foldChain)
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.BlockchainTime

diff --git a/ouroboros-consensus-mock/ouroboros-consensus-mock.cabal b/ouroboros-consensus-mock/ouroboros-consensus-mock.cabal
@@ -62,7 +62,8 @@ library
                      , serialise         >=0.2   && <0.3
                      , time
 
-                     , ouroboros-network
+                     , ouroboros-network-api
+                     , ouroboros-network-mock
                      , ouroboros-network-protocols
                      , ouroboros-consensus
 

diff --git a/ouroboros-consensus-mock/src/Ouroboros/Consensus/Mock/Ledger/UTxO.hs b/ouroboros-consensus-mock/src/Ouroboros/Consensus/Mock/Ledger/UTxO.hs
@@ -43,7 +43,7 @@ import           NoThunks.Class (InspectHeap (..), NoThunks)
 import           Cardano.Binary (ToCBOR (..))
 import           Cardano.Crypto.Hash
 
-import           Ouroboros.Network.MockChain.Chain (Chain, toOldestFirst)
+import           Ouroboros.Network.Mock.Chain (Chain, toOldestFirst)
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Util (repeatedlyM)

diff --git a/ouroboros-consensus-shelley-test/ouroboros-consensus-shelley-test.cabal b/ouroboros-consensus-shelley-test/ouroboros-consensus-shelley-test.cabal
@@ -55,6 +55,7 @@ library
                      , cardano-protocol-tpraos
                      , small-steps
 
+                     , ouroboros-network-api
                      , ouroboros-network-protocols
                      , ouroboros-consensus
                      , ouroboros-consensus-protocol

diff --git a/ouroboros-consensus-shelley/ouroboros-consensus-shelley.cabal b/ouroboros-consensus-shelley/ouroboros-consensus-shelley.cabal
@@ -85,7 +85,7 @@ library
                      , cardano-ledger-shelley-ma
                      , small-steps
 
-                     , ouroboros-network
+                     , ouroboros-network-api
                      , ouroboros-network-protocols
                      , ouroboros-consensus
                      , ouroboros-consensus-protocol

diff --git a/ouroboros-consensus-test/ouroboros-consensus-test.cabal b/ouroboros-consensus-test/ouroboros-consensus-test.cabal
@@ -118,8 +118,10 @@ library
                      , io-classes
                      , io-sim
 
+                     , ouroboros-network-api
                      , ouroboros-network
                      , ouroboros-network-framework
+                     , ouroboros-network-mock
                      , ouroboros-network-protocols
                      , ouroboros-consensus
                      , ouroboros-consensus-diffusion
@@ -188,7 +190,9 @@ test-suite test-consensus
                      , io-sim
                      , typed-protocols
                      , ouroboros-network
+                     , ouroboros-network-api
                      , ouroboros-network-framework
+                     , ouroboros-network-mock
                      , ouroboros-network-protocols
                      , ouroboros-network-protocols:testlib
                      , ouroboros-consensus
@@ -274,7 +278,8 @@ test-suite test-storage
 
                      , io-classes
                      , io-sim
-                     , ouroboros-network
+                     , ouroboros-network-api
+                     , ouroboros-network-mock
                      , ouroboros-network-protocols
                      , ouroboros-consensus
                      , ouroboros-consensus-test

diff --git a/ouroboros-consensus-test/src/Test/ThreadNet/General.hs b/ouroboros-consensus-test/src/Test/ThreadNet/General.hs
@@ -44,7 +44,7 @@ import           Test.QuickCheck
 
 import           Control.Monad.IOSim (runSimOrThrow, setCurrentTime)
 
-import qualified Ouroboros.Network.MockChain.Chain as MockChain
+import qualified Ouroboros.Network.Mock.Chain as MockChain
 
 import           Ouroboros.Consensus.Block
 import qualified Ouroboros.Consensus.Block.Abstract as BA

diff --git a/ouroboros-consensus-test/src/Test/ThreadNet/Network.hs b/ouroboros-consensus-test/src/Test/ThreadNet/Network.hs
@@ -66,11 +66,12 @@ import qualified Ouroboros.Network.AnchoredFragment as AF
 import           Ouroboros.Network.BlockFetch (BlockFetchConfiguration (..),
                      TraceLabelPeer (..))
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.MockChain.Chain (Chain (Genesis))
+import           Ouroboros.Network.Mock.Chain (Chain (Genesis))
 import           Ouroboros.Network.Point (WithOrigin (..))
 import qualified Ouroboros.Network.Protocol.ChainSync.Type as CS
 
-import           Ouroboros.Network.Mux (ControlMessage (..), ControlMessageSTM)
+import           Ouroboros.Network.ControlMessage (ControlMessage (..),
+                     ControlMessageSTM)
 import           Ouroboros.Network.NodeToNode (MiniProtocolParameters (..))
 import           Ouroboros.Network.PeerSelection.PeerMetric (nullMetric)
 import           Ouroboros.Network.Protocol.KeepAlive.Type

diff --git a/ouroboros-consensus-test/src/Test/ThreadNet/Util.hs b/ouroboros-consensus-test/src/Test/ThreadNet/Util.hs
@@ -33,8 +33,8 @@ import           Data.Word (Word64)
 import           Numeric.Natural (Natural)
 import           Test.QuickCheck
 
-import           Ouroboros.Network.MockChain.Chain (Chain (..))
-import qualified Ouroboros.Network.MockChain.Chain as Chain
+import           Ouroboros.Network.Mock.Chain (Chain (..))
+import qualified Ouroboros.Network.Mock.Chain as Chain
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Config.SecurityParam

diff --git a/ouroboros-consensus-test/src/Test/Util/ChainUpdates.hs b/ouroboros-consensus-test/src/Test/Util/ChainUpdates.hs
@@ -16,8 +16,8 @@ import           Control.Monad.State.Strict
 
 import           Test.QuickCheck
 
-import           Ouroboros.Network.MockChain.Chain (Chain (Genesis))
-import qualified Ouroboros.Network.MockChain.Chain as Chain
+import           Ouroboros.Network.Mock.Chain (Chain (Genesis))
+import qualified Ouroboros.Network.Mock.Chain as Chain
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Config

diff --git a/ouroboros-consensus-test/src/Test/Util/MockChain.hs b/ouroboros-consensus-test/src/Test/Util/MockChain.hs
@@ -13,7 +13,7 @@ module Test.Util.MockChain (
 import           Data.Foldable (foldl')
 import           Data.Sequence.Strict (StrictSeq (..))
 
-import           Ouroboros.Network.MockChain.Chain
+import           Ouroboros.Network.Mock.Chain
 
 import           Ouroboros.Consensus.Block
 

diff --git a/ouroboros-consensus-test/src/Test/Util/TestBlock.hs b/ouroboros-consensus-test/src/Test/Util/TestBlock.hs
@@ -100,8 +100,8 @@ import           Test.QuickCheck hiding (Result)
 import           Cardano.Crypto.DSIGN
 
 import           Ouroboros.Network.Magic (NetworkMagic (..))
-import           Ouroboros.Network.MockChain.Chain (Chain (..))
-import qualified Ouroboros.Network.MockChain.Chain as Chain
+import           Ouroboros.Network.Mock.Chain (Chain (..))
+import qualified Ouroboros.Network.Mock.Chain as Chain
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.BlockchainTime

diff --git a/ouroboros-consensus-test/test-consensus/Test/Consensus/HardFork/Combinator.hs b/ouroboros-consensus-test/test-consensus/Test/Consensus/HardFork/Combinator.hs
@@ -32,7 +32,7 @@ import           Test.Tasty
 import           Test.Tasty.QuickCheck
 import           Test.Util.Time (dawnOfTime)
 
-import qualified Ouroboros.Network.MockChain.Chain as Mock
+import qualified Ouroboros.Network.Mock.Chain as Mock
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.BlockchainTime

diff --git a/ouroboros-consensus-test/test-consensus/Test/Consensus/MiniProtocol/BlockFetch/Client.hs b/ouroboros-consensus-test/test-consensus/Test/Consensus/MiniProtocol/BlockFetch/Client.hs
@@ -48,12 +48,12 @@ import           Ouroboros.Network.BlockFetch (BlockFetchConfiguration (..),
                      newFetchClientRegistry)
 import           Ouroboros.Network.BlockFetch.Client (blockFetchClient)
 import           Ouroboros.Network.Channel (createConnectedChannels)
+import           Ouroboros.Network.ControlMessage (ControlMessage (..))
 import qualified Ouroboros.Network.Driver.Simple as Driver
-import           Ouroboros.Network.MockChain.Chain (Chain)
-import qualified Ouroboros.Network.MockChain.Chain as Chain
-import qualified Ouroboros.Network.Mux as Mux
-import           Ouroboros.Network.NodeToNode (isPipeliningEnabled)
-import           Ouroboros.Network.NodeToNode.Version (NodeToNodeVersion)
+import           Ouroboros.Network.Mock.Chain (Chain)
+import qualified Ouroboros.Network.Mock.Chain as Chain
+import           Ouroboros.Network.NodeToNode.Version (NodeToNodeVersion,
+                     isPipeliningEnabled)
 import           Ouroboros.Network.Protocol.BlockFetch.Codec (codecBlockFetchId)
 import           Ouroboros.Network.Protocol.BlockFetch.Server
                      (BlockFetchBlockSender (SendMsgNoBlocks, SendMsgStartBatch),
@@ -128,7 +128,7 @@ runBlockFetchTest ::
   -> m BlockFetchClientOutcome
 runBlockFetchTest BlockFetchClientTestSetup{..} = withRegistry \registry -> do
     varChains           <- uncheckedNewTVarM Map.empty
-    varControlMessage   <- uncheckedNewTVarM Mux.Continue
+    varControlMessage   <- uncheckedNewTVarM Continue
     varFetchedBlocks    <- uncheckedNewTVarM (0 <$ peerUpdates)
 
     fetchClientRegistry <- newFetchClientRegistry
@@ -222,7 +222,7 @@ runBlockFetchTest BlockFetchClientTestSetup{..} = withRegistry \registry -> do
           try $ runBlockFetchClient peerId
 
     LogicalClock.waitUntilDone clock
-    atomically $ writeTVar varControlMessage Mux.Terminate
+    atomically $ writeTVar varControlMessage Terminate
 
     bfcoBlockFetchResults <- traverse waitThread blockFetchThreads
     bfcoFetchedBlocks     <- readTVarIO varFetchedBlocks

diff --git a/ouroboros-consensus-test/test-consensus/Test/Consensus/MiniProtocol/ChainSync/Client.hs b/ouroboros-consensus-test/test-consensus/Test/Consensus/MiniProtocol/ChainSync/Client.hs
@@ -30,13 +30,13 @@ import           Ouroboros.Network.AnchoredFragment (AnchoredFragment)
 import qualified Ouroboros.Network.AnchoredFragment as AF
 import           Ouroboros.Network.Block (getTipPoint)
 import           Ouroboros.Network.Channel
+import           Ouroboros.Network.ControlMessage (ControlMessage (..))
 import           Ouroboros.Network.Driver
-import           Ouroboros.Network.MockChain.Chain (Chain (Genesis))
-import qualified Ouroboros.Network.MockChain.Chain as Chain
-import           Ouroboros.Network.MockChain.ProducerState (chainState,
+import           Ouroboros.Network.Mock.Chain (Chain (Genesis))
+import qualified Ouroboros.Network.Mock.Chain as Chain
+import           Ouroboros.Network.Mock.ProducerState (chainState,
                      initChainProducerState)
-import qualified Ouroboros.Network.MockChain.ProducerState as CPS
-import           Ouroboros.Network.Mux (ControlMessage (..))
+import qualified Ouroboros.Network.Mock.ProducerState as CPS
 import           Ouroboros.Network.Protocol.ChainSync.ClientPipelined
 import           Ouroboros.Network.Protocol.ChainSync.Codec (codecChainSyncId)
 import           Ouroboros.Network.Protocol.ChainSync.Examples

diff --git a/...boros-consensus-test/test-consensus/Test/Consensus/MiniProtocol/LocalStateQuery/Server.hs b/...boros-consensus-test/test-consensus/Test/Consensus/MiniProtocol/LocalStateQuery/Server.hs
@@ -14,8 +14,8 @@ import           Control.Monad.IOSim (runSimOrThrow)
 import           Cardano.Crypto.DSIGN.Mock
 
 import           Network.TypedProtocol.Proofs (connect)
-import           Ouroboros.Network.MockChain.Chain (Chain (..))
-import qualified Ouroboros.Network.MockChain.Chain as Chain
+import           Ouroboros.Network.Mock.Chain (Chain (..))
+import qualified Ouroboros.Network.Mock.Chain as Chain
 import           Ouroboros.Network.Protocol.LocalStateQuery.Client
 import           Ouroboros.Network.Protocol.LocalStateQuery.Examples
                      (localStateQueryClient)

diff --git a/ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/FollowerPromptness.hs b/ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/FollowerPromptness.hs
@@ -33,7 +33,7 @@ import           Test.QuickCheck
 import           Test.Tasty
 import           Test.Tasty.QuickCheck
 
-import qualified Ouroboros.Network.MockChain.Chain as Chain
+import qualified Ouroboros.Network.Mock.Chain as Chain
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Config

diff --git a/ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/Iterator.hs b/ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/Iterator.hs
@@ -14,8 +14,8 @@ import qualified Data.Map.Strict as Map
 
 import           Control.Monad.IOSim (runSimOrThrow)
 
-import           Ouroboros.Network.MockChain.Chain (Chain)
-import qualified Ouroboros.Network.MockChain.Chain as Chain
+import           Ouroboros.Network.Mock.Chain (Chain)
+import qualified Ouroboros.Network.Mock.Chain as Chain
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Util.Condense (condense)

diff --git a/ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/Model.hs b/ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/Model.hs
@@ -98,9 +98,9 @@ import           GHC.Generics (Generic)
 import           Ouroboros.Network.AnchoredFragment (AnchoredFragment)
 import qualified Ouroboros.Network.AnchoredFragment as Fragment
 import           Ouroboros.Network.Block (MaxSlotNo (..))
-import           Ouroboros.Network.MockChain.Chain (Chain (..), ChainUpdate)
-import qualified Ouroboros.Network.MockChain.Chain as Chain
-import qualified Ouroboros.Network.MockChain.ProducerState as CPS
+import           Ouroboros.Network.Mock.Chain (Chain (..), ChainUpdate)
+import qualified Ouroboros.Network.Mock.Chain as Chain
+import qualified Ouroboros.Network.Mock.ProducerState as CPS
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Config

diff --git a/ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/Model/Test.hs b/ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/Model/Test.hs
@@ -14,7 +14,7 @@ import           Test.Tasty
 import           Test.Tasty.QuickCheck
 
 import qualified Ouroboros.Network.AnchoredFragment as AF
-import qualified Ouroboros.Network.MockChain.Chain as Chain
+import qualified Ouroboros.Network.Mock.Chain as Chain
 
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Config