integrate and squash

Author: crocodile-dentist

ouroboros-network-framework/demo/connection-manager.hs

@@ -61,12 +61,12 @@ import Network.TypedProtocol.ReqResp.Type (ReqResp)
 
 import Ouroboros.Network.ConnectionHandler
 import Ouroboros.Network.ConnectionManager.Core qualified as CM
-import Ouroboros.Network.ConnectionManager.InformationChannel
-           (newInformationChannel)
 import Ouroboros.Network.ConnectionManager.State qualified as CM
 import Ouroboros.Network.ConnectionManager.Types
 import Ouroboros.Network.Context
 import Ouroboros.Network.InboundGovernor qualified as InboundGovernor
+import Ouroboros.Network.InboundGovernor.InformationChannel
+           (newInformationChannel)
 import Ouroboros.Network.IOManager
 import Ouroboros.Network.Mux
 import Ouroboros.Network.MuxMode

ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/ConnectionManager.hs

@@ -71,9 +71,9 @@ import Ouroboros.Network.Snocket (Accept (..), Accepted (..),
 
 import Test.Ouroboros.Network.ConnectionManager.Utils (verifyAbstractTransition)
 
-import Ouroboros.Network.ConnectionManager.InformationChannel
+import Ouroboros.Network.InboundGovernor.InformationChannel
            (newInformationChannel)
-import Ouroboros.Network.ConnectionManager.InformationChannel qualified as InfoChannel
+import Ouroboros.Network.InboundGovernor.InformationChannel qualified as InfoChannel
 
 
 

ouroboros-network-framework/testlib/Test/Ouroboros/Network/ConnectionManager/Experiments.hs

@@ -84,6 +84,8 @@ import Ouroboros.Network.Context
 import Ouroboros.Network.ControlMessage
 import Ouroboros.Network.Driver.Limits
 import Ouroboros.Network.InboundGovernor qualified as InboundGovernor
+import Ouroboros.Network.InboundGovernor.InformationChannel
+           (newInformationChannel)
 import Ouroboros.Network.Mux
 import Ouroboros.Network.MuxMode
 import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
@@ -105,9 +107,6 @@ import Test.Ouroboros.Network.ConnectionManager.Timeouts
 import Test.Ouroboros.Network.Orphans ()
 import Test.Ouroboros.Network.Utils (WithName (..))
 
-import Ouroboros.Network.ConnectionManager.InformationChannel
-           (newInformationChannel)
-
 
 --
 -- Server tests