ouroboros-network-framework: renamed Ourboros.Network.Server2 module

IntersectMBO · Jan 3, 2025 · 75c2556 · 75c2556
1 parent 7f93d0d
commit 75c2556
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 32 deletions.
diff --git a/ouroboros-network-framework/demo/connection-manager.hs b/ouroboros-network-framework/demo/connection-manager.hs
@@ -73,8 +73,8 @@ import Ouroboros.Network.Protocol.Handshake.Unversioned
 import Ouroboros.Network.Protocol.Handshake.Version (Acceptable (..),
            Queryable (..))
 import Ouroboros.Network.RethrowPolicy
+import Ouroboros.Network.Server qualified as Server
 import Ouroboros.Network.Server.RateLimiting (AcceptedConnectionsLimit (..))
-import Ouroboros.Network.Server2 qualified as Server
 import Ouroboros.Network.Snocket (Snocket, socketSnocket)
 import Ouroboros.Network.Snocket qualified as Snocket
 import Ouroboros.Network.Util.ShowProxy

diff --git a/ouroboros-network-framework/io-tests/Main.hs b/ouroboros-network-framework/io-tests/Main.hs
@@ -5,7 +5,7 @@ import Test.Tasty
 
 import Test.Ouroboros.Network.Driver qualified as Driver
 import Test.Ouroboros.Network.RawBearer qualified as RawBearer
-import Test.Ouroboros.Network.Server2.IO qualified as Server2
+import Test.Ouroboros.Network.Server.IO qualified as Server
 import Test.Ouroboros.Network.Socket qualified as Socket
 
 main :: IO ()
@@ -15,7 +15,7 @@ tests :: TestTree
 tests =
   testGroup "ouroboros-network-framework:io-tests"
   [ Driver.tests
-  , Server2.tests
+  , Server.tests
   , Socket.tests
   , RawBearer.tests
   ]

diff --git a/...ests/Test/Ouroboros/Network/Server2/IO.hs → ...tests/Test/Ouroboros/Network/Server/IO.hs b/...ests/Test/Ouroboros/Network/Server2/IO.hs → ...tests/Test/Ouroboros/Network/Server/IO.hs
@@ -11,7 +11,7 @@
 {-# OPTIONS_GHC -Wno-x-partial #-}
 #endif
 
-module Test.Ouroboros.Network.Server2.IO (tests) where
+module Test.Ouroboros.Network.Server.IO (tests) where
 
 import Control.Monad.Class.MonadThrow
 import System.Random (mkStdGen)
@@ -34,7 +34,7 @@ import Test.Ouroboros.Network.Orphans ()
 tests :: TestTree
 tests =
   testGroup "Ouroboros.Network"
-  [ testGroup "Server2"
+  [ testGroup "Server"
     [ testProperty "unidirectional IO" prop_unidirectional_IO
     , testProperty "bidirectional IO"  prop_bidirectional_IO
     ]

diff --git a/ouroboros-network-framework/ouroboros-network-framework.cabal b/ouroboros-network-framework/ouroboros-network-framework.cabal
@@ -54,9 +54,9 @@ library
     Ouroboros.Network.Protocol.Handshake.Version
     Ouroboros.Network.RawBearer
     Ouroboros.Network.RethrowPolicy
+    Ouroboros.Network.Server
     Ouroboros.Network.Server.ConnectionTable
     Ouroboros.Network.Server.RateLimiting
-    Ouroboros.Network.Server2
     Ouroboros.Network.Snocket
     Ouroboros.Network.Socket
     Simulation.Network.Snocket
@@ -161,7 +161,7 @@ test-suite sim-tests
     Test.Ouroboros.Network.ConnectionManager
     Test.Ouroboros.Network.RateLimiting
     Test.Ouroboros.Network.RawBearer
-    Test.Ouroboros.Network.Server2.Sim
+    Test.Ouroboros.Network.Server.Sim
     Test.Ouroboros.Network.Socket
     Test.Simulation.Network.Snocket
 
@@ -230,7 +230,7 @@ test-suite io-tests
   other-modules:
     Test.Ouroboros.Network.Driver
     Test.Ouroboros.Network.RawBearer
-    Test.Ouroboros.Network.Server2.IO
+    Test.Ouroboros.Network.Server.IO
     Test.Ouroboros.Network.Socket
 
   build-depends:

diff --git a/ouroboros-network-framework/sim-tests/Main.hs b/ouroboros-network-framework/sim-tests/Main.hs
@@ -5,7 +5,7 @@ import Test.Tasty
 
 import Test.Ouroboros.Network.ConnectionManager qualified as ConnectionManager
 import Test.Ouroboros.Network.RateLimiting qualified as RateLimiting
-import Test.Ouroboros.Network.Server2.Sim qualified as Server2
+import Test.Ouroboros.Network.Server.Sim qualified as Server
 import Test.Simulation.Network.Snocket qualified as Snocket
 
 main :: IO ()
@@ -15,7 +15,7 @@ tests :: TestTree
 tests =
   testGroup "ouroboros-network-framework:sim-tests"
   [ ConnectionManager.tests
-  , Server2.tests
+  , Server.tests
   , RateLimiting.tests
   , Snocket.tests
   ]

diff --git a/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/ConnectionManager.hs b/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/ConnectionManager.hs
@@ -80,7 +80,7 @@ tests :: TestTree
 tests =
   testGroup "Ouroboros.Network.ConnectionManager"
   [ -- generators, shrinkers properties
-    -- TODO: replace these tests with 'Test.Ouroboros.Network.Server2' simulation.
+    -- TODO: replace these tests with 'Test.Ouroboros.Network.Server' simulation.
     testProperty "overwritten"                    unit_overwritten
   , testProperty "timeoutExpired"                 unit_timeoutExpired
   ]

diff --git a/...sts/Test/Ouroboros/Network/Server2/Sim.hs → ...ests/Test/Ouroboros/Network/Server/Sim.hs b/...sts/Test/Ouroboros/Network/Server2/Sim.hs → ...ests/Test/Ouroboros/Network/Server/Sim.hs
@@ -19,7 +19,7 @@
 -- for 'debugTracer'
 {-# OPTIONS_GHC -Wno-redundant-constraints #-}
 
-module Test.Ouroboros.Network.Server2.Sim (tests) where
+module Test.Ouroboros.Network.Server.Sim (tests) where
 
 import Control.Applicative (Alternative ((<|>)))
 import Control.Concurrent.Class.MonadSTM qualified as LazySTM
@@ -86,9 +86,9 @@ import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
 import Ouroboros.Network.Protocol.Handshake.Codec (noTimeLimitsHandshake,
            timeLimitsHandshake)
 import Ouroboros.Network.Protocol.Handshake.Unversioned
+import Ouroboros.Network.Server (RemoteTransitionTrace)
+import Ouroboros.Network.Server qualified as Server
 import Ouroboros.Network.Server.RateLimiting (AcceptedConnectionsLimit (..))
-import Ouroboros.Network.Server2 (RemoteTransitionTrace)
-import Ouroboros.Network.Server2 qualified as Server
 import Ouroboros.Network.Snocket (Snocket, TestAddress (..))
 import Ouroboros.Network.Snocket qualified as Snocket
 
@@ -137,7 +137,7 @@ tests =
     , testProperty "matured peers"          prop_inbound_governor_maturedPeers
     , testProperty "timeouts enforced"      prop_timeouts_enforced
     ]
-  , testGroup "Server2"
+  , testGroup "Server"
     [ testProperty "unidirectional Sim"     prop_unidirectional_Sim
     , testProperty "bidirectional Sim"      prop_bidirectional_Sim
     , testProperty "never above hardlimit"  prop_never_above_hardlimit

diff --git a/...ramework/src/Ouroboros/Network/Server2.hs → ...framework/src/Ouroboros/Network/Server.hs b/...ramework/src/Ouroboros/Network/Server2.hs → ...framework/src/Ouroboros/Network/Server.hs
@@ -15,7 +15,7 @@
 --
 -- This module should be imported qualified.
 --
-module Ouroboros.Network.Server2
+module Ouroboros.Network.Server
   ( Arguments (..)
     -- * Run server
   , with

diff --git a/ouroboros-network-framework/testlib/Test/Ouroboros/Network/ConnectionManager/Experiments.hs b/ouroboros-network-framework/testlib/Test/Ouroboros/Network/ConnectionManager/Experiments.hs
@@ -92,9 +92,9 @@ import Ouroboros.Network.Protocol.Handshake.Unversioned
 import Ouroboros.Network.Protocol.Handshake.Version (Acceptable (..),
            Queryable (..))
 import Ouroboros.Network.RethrowPolicy
+import Ouroboros.Network.Server (RemoteTransitionTrace)
+import Ouroboros.Network.Server qualified as Server
 import Ouroboros.Network.Server.RateLimiting (AcceptedConnectionsLimit (..))
-import Ouroboros.Network.Server2 (RemoteTransitionTrace)
-import Ouroboros.Network.Server2 qualified as Server
 import Ouroboros.Network.Snocket (Snocket)
 import Ouroboros.Network.Snocket qualified as Snocket
 

diff --git a/ouroboros-network-framework/testlib/Test/Ouroboros/Network/InboundGovernor/Utils.hs b/ouroboros-network-framework/testlib/Test/Ouroboros/Network/InboundGovernor/Utils.hs
@@ -11,8 +11,8 @@ import Test.QuickCheck.Monoids
 import Ouroboros.Network.ConnectionManager.Types
 import Ouroboros.Network.InboundGovernor (RemoteSt (..))
 import Ouroboros.Network.InboundGovernor qualified as IG
-import Ouroboros.Network.Server2 (RemoteTransition)
-import Ouroboros.Network.Server2 qualified as Server
+import Ouroboros.Network.Server (RemoteTransition)
+import Ouroboros.Network.Server qualified as Server
 
 
 -- | Pattern synonym which matches either 'RemoteHotEst' or 'RemoteWarmSt'.

diff --git a/ouroboros-network-testing/src/Test/Ouroboros/Network/Data/AbsBearerInfo.hs b/ouroboros-network-testing/src/Test/Ouroboros/Network/Data/AbsBearerInfo.hs
@@ -132,14 +132,14 @@ instance Arbitrary AbsIOError where
       , connectionAbortedError
       ]
     where
-      -- `ECONNABORTED` error which appears in `Ouroboros.Network.Server2`
+      -- `ECONNABORTED` error which appears in `Ouroboros.Network.Server`
       connectionAbortedError :: IOError
       connectionAbortedError = IOError
         { ioe_handle      = Nothing
         , ioe_type        = OtherError
         , ioe_location    = "Ouroboros.Network.Snocket.Sim.accept"
           -- Note: this matches the `iseCONNABORTED` on Windows, see
-          -- 'Ouroboros.Network.Server2`
+          -- 'Ouroboros.Network.Server`
         , ioe_description = "Software caused connection abort (WSAECONNABORTED)"
         , ioe_errno       = Just (case eCONNABORTED of Errno errno -> errno)
         , ioe_filename    = Nothing

diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs
@@ -78,7 +78,7 @@ import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency (..),
 import Ouroboros.Network.PeerSelection.State.LocalRootPeers qualified as LocalRootPeers
 import Ouroboros.Network.PeerSelection.Types
 import Ouroboros.Network.PeerSharing (PeerSharingResult (..))
-import Ouroboros.Network.Server2 qualified as Server
+import Ouroboros.Network.Server qualified as Server
 
 import Simulation.Network.Snocket (BearerInfo (..))
 
@@ -3075,7 +3075,7 @@ prop_diffusion_target_active_local_above ioSimTrace traceNumber =
 
 
 -- | A variant of ouroboros-network-framework
--- 'Test.Ouroboros.Network.Server2.prop_connection_manager_valid_transitions'
+-- 'Test.Ouroboros.Network.Server.prop_connection_manager_valid_transitions'
 -- but for running on Diffusion. This means it has to have in consideration
 -- that the logs for all nodes running will all appear in the trace and the test
 -- property should only be valid while a given node is up and running.
@@ -3163,7 +3163,7 @@ prop_diffusion_cm_valid_transitions ioSimTrace traceNumber =
 
 
 -- | A variant of ouroboros-network-framework
--- 'Test.Ouroboros.Network.Server2.prop_connection_manager_valid_transition_order'
+-- 'Test.Ouroboros.Network.Server.prop_connection_manager_valid_transition_order'
 -- but for running on Diffusion. This means it has to have in consideration the
 -- the logs for all nodes running will all appear in the trace and the test
 -- property should only be valid while a given node is up and running.
@@ -3224,7 +3224,7 @@ prop_diffusion_cm_valid_transition_order_iosim_por ioSimTrace traceNumber =
        . groupConns id abstractStateIsFinalTransitionTVarTracing
 
 -- | A variant of ouroboros-network-framework
--- 'Test.Ouroboros.Network.Server2.prop_connection_manager_valid_transition_order'
+-- 'Test.Ouroboros.Network.Server.prop_connection_manager_valid_transition_order'
 -- but for running on Diffusion. This means it has to have in consideration the
 -- the logs for all nodes running will all appear in the trace and the test
 -- property should only be valid while a given node is up and running.
@@ -4059,7 +4059,7 @@ prop_splitWith f as = foldr (++) [] (splitWith f as) === as
 
 
 -- | A variant of ouroboros-network-framework
--- 'Test.Ouroboros.Network.Server2.prop_inbound_governor_valid_transitions'
+-- 'Test.Ouroboros.Network.Server.prop_inbound_governor_valid_transitions'
 -- but for running on Diffusion. This means it has to have in consideration the
 -- the logs for all nodes running will all appear in the trace and the test
 -- property should only be valid while a given node is up and running.
@@ -4117,7 +4117,7 @@ prop_diffusion_ig_valid_transitions ioSimTrace traceNumber =
          $ remoteTransitionTraceEvents
 
 -- | A variant of ouroboros-network-framework
--- 'Test.Ouroboros.Network.Server2.prop_inbound_governor_valid_transition_order'
+-- 'Test.Ouroboros.Network.Server.prop_inbound_governor_valid_transition_order'
 -- but for running on Diffusion. This means it has to have in consideration the
 -- the logs for all nodes running will all appear in the trace and the test
 -- property should only be valid while a given node is up and running.
@@ -4170,7 +4170,7 @@ prop_diffusion_ig_valid_transition_order ioSimTrace traceNumber =
         $ remoteTransitionTraceEvents
 
 -- | A variant of ouroboros-network-framework
--- 'Test.Ouroboros.Network.Server2.prop_timeouts_enforced'
+-- 'Test.Ouroboros.Network.Server.prop_timeouts_enforced'
 -- but for running on Diffusion. This means it has to have in consideration the
 -- the logs for all nodes running will all appear in the trace and the test
 -- property should only be valid while a given node is up and running.

diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Internal.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Internal.hs
@@ -100,8 +100,8 @@ import Ouroboros.Network.Protocol.Handshake.Version (Accept (Accept))
 import Ouroboros.Network.Protocol.KeepAlive.Codec (byteLimitsKeepAlive,
            timeLimitsKeepAlive)
 import Ouroboros.Network.Protocol.Limits (shortWait, smallByteLimit)
+import Ouroboros.Network.Server qualified as Server
 import Ouroboros.Network.Server.RateLimiting (AcceptedConnectionsLimit (..))
-import Ouroboros.Network.Server2 qualified as Server
 import Ouroboros.Network.Snocket (Snocket, TestAddress (..))
 
 import Ouroboros.Network.Block (BlockNo)

diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion.hs
@@ -102,7 +102,7 @@ import Ouroboros.Network.NodeToNode (AcceptedConnectionsLimit (..),
 import Ouroboros.Network.NodeToNode qualified as NodeToNode
 import Ouroboros.Network.PeerSharing (PeerSharingRegistry (..))
 import Ouroboros.Network.RethrowPolicy
-import Ouroboros.Network.Server2 qualified as Server
+import Ouroboros.Network.Server qualified as Server
 
 import Ouroboros.Network.PeerSelection.Churn (PeerChurnArgs (..))
 import Ouroboros.Network.PeerSelection.Governor qualified as Governor

diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/Types.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/Types.hs
@@ -42,7 +42,7 @@ import Ouroboros.Network.ExitPolicy
 import Ouroboros.Network.InboundGovernor (RemoteTransitionTrace)
 import Ouroboros.Network.InboundGovernor qualified as InboundGovernor
 import Ouroboros.Network.RethrowPolicy
-import Ouroboros.Network.Server2 qualified as Server
+import Ouroboros.Network.Server qualified as Server
 import Ouroboros.Network.Snocket (FileDescriptor)
 import Ouroboros.Network.Socket (SystemdSocketTracer)