From d0f1f935a8b16208cd9282e85bbd1b5d065b9a0b Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Wed, 12 Feb 2025 13:45:52 +0100 Subject: [PATCH] testnet: move Node module Also edit export lists so that we need fewer imports. --- ouroboros-network/ouroboros-network.cabal | 2 +- .../Network/Diffusion/{Testnet => }/Node.hs | 16 ++++++++++---- .../Network/Diffusion/Testnet/Cardano.hs | 2 +- .../Diffusion/Testnet/Cardano/Simulation.hs | 21 +++++++------------ 4 files changed, 21 insertions(+), 20 deletions(-) rename ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/{Testnet => }/Node.hs (98%) diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal index 2d5c270930..bbd9ae99ad 100644 --- a/ouroboros-network/ouroboros-network.cabal +++ b/ouroboros-network/ouroboros-network.cabal @@ -259,13 +259,13 @@ library sim-tests-lib Ouroboros.Network.BlockFetch.Examples Ouroboros.Network.MockNode Test.Ouroboros.Network.BlockFetch + Test.Ouroboros.Network.Diffusion.Node Test.Ouroboros.Network.Diffusion.Node.ChainDB Test.Ouroboros.Network.Diffusion.Node.Kernel Test.Ouroboros.Network.Diffusion.Node.MiniProtocols Test.Ouroboros.Network.Diffusion.Policies Test.Ouroboros.Network.Diffusion.Testnet.Cardano Test.Ouroboros.Network.Diffusion.Testnet.Cardano.Simulation - Test.Ouroboros.Network.Diffusion.Testnet.Node Test.Ouroboros.Network.KeepAlive Test.Ouroboros.Network.LedgerPeers Test.Ouroboros.Network.MockNode diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Node.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs similarity index 98% rename from ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Node.hs rename to ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs index 2c09da3316..6fe2316971 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Node.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs @@ -8,18 +8,21 @@ {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} -module Test.Ouroboros.Network.Diffusion.Testnet.Node +module Test.Ouroboros.Network.Diffusion.Node ( -- * run a node - Node.BlockGeneratorArgs (..) - , Node.LimitsAndTimeouts (..) - , Interfaces (..) + Interfaces (..) , Arguments (..) , run -- * node types , NtNAddr , NtNFD + , NtNVersion + , NtNVersionData , NtCAddr , NtCFD + , NtCVersion + , NtCVersionData + , Node.NtNAddr_ (..) -- * extra types used by the node , AcceptedConnectionsLimit (..) , DiffusionMode (..) @@ -27,6 +30,11 @@ module Test.Ouroboros.Network.Diffusion.Testnet.Node , PeerSelectionTargets (..) -- * configuration constants , config_REPROMOTE_DELAY + -- * re-exports + , Node.BlockGeneratorArgs (..) + , Node.LimitsAndTimeouts (..) + , Node.randomBlockGenerationArgs + , Node.ntnAddrToRelayAccessPoint ) where import Control.Applicative (Alternative) diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs index f9cb87583f..8423061173 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs @@ -94,9 +94,9 @@ import Test.Ouroboros.Network.Data.AbsBearerInfo import Test.Ouroboros.Network.Data.Script import Test.Ouroboros.Network.Data.Signal import Test.Ouroboros.Network.Data.Signal qualified as Signal +import Test.Ouroboros.Network.Diffusion.Node (config_REPROMOTE_DELAY) import Test.Ouroboros.Network.Diffusion.Node.Kernel import Test.Ouroboros.Network.Diffusion.Testnet.Cardano.Simulation -import Test.Ouroboros.Network.Diffusion.Testnet.Node (config_REPROMOTE_DELAY) import Test.Ouroboros.Network.InboundGovernor.Utils import Test.Ouroboros.Network.LedgerPeers (LedgerPools (..)) import Test.Ouroboros.Network.Utils hiding (SmallDelay, debugTracer) diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs index 86fc8b1d0c..4cc3941b7e 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs @@ -109,14 +109,12 @@ import Ouroboros.Network.InboundGovernor (RemoteTransitionTrace) import Ouroboros.Network.InboundGovernor qualified as IG import Ouroboros.Network.Mock.ConcreteBlock (Block (..), BlockHeader (..)) import Ouroboros.Network.Mux (MiniProtocolLimits (..)) -import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..)) import Ouroboros.Network.PeerSelection.Governor (DebugPeerSelection (..), - PeerSelectionTargets (..), TracePeerSelection) + TracePeerSelection) import Ouroboros.Network.PeerSelection.Governor qualified as PeerSelection import Ouroboros.Network.PeerSelection.LedgerPeers (AfterSlot (..), LedgerPeersConsensusInterface (..), TraceLedgerPeers, UseLedgerPeers (..), accPoolStake) -import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.PeerSelection.PeerStateActions (PeerSelectionActionsTrace) @@ -138,7 +136,6 @@ import Ouroboros.Network.Protocol.KeepAlive.Codec (byteLimitsKeepAlive, import Ouroboros.Network.Protocol.Limits (shortWait, smallByteLimit) import Ouroboros.Network.Protocol.PeerSharing.Codec (byteLimitsPeerSharing, timeLimitsPeerSharing) -import Ouroboros.Network.Server.RateLimiting (AcceptedConnectionsLimit (..)) import Ouroboros.Network.Server2 qualified as Server import Ouroboros.Network.Snocket (Snocket, TestAddress (..)) @@ -146,11 +143,7 @@ import Simulation.Network.Snocket (BearerInfo (..), FD, SnocketTrace, WithAddr (..), makeFDBearer, withSnocket) import Test.Ouroboros.Network.Data.Script -import Test.Ouroboros.Network.Diffusion.Node.Kernel (BlockGeneratorArgs, - NtCAddr, NtCVersion, NtCVersionData, NtNAddr, NtNAddr_ (IPAddr), - NtNVersion, NtNVersionData, ntnAddrToRelayAccessPoint, - randomBlockGenerationArgs) -import Test.Ouroboros.Network.Diffusion.Testnet.Node qualified as Node +import Test.Ouroboros.Network.Diffusion.Node as Node import Test.Ouroboros.Network.LedgerPeers (LedgerPools (..), genLedgerPoolsFrom) import Test.Ouroboros.Network.PeerSelection.Cardano.Instances () import Test.Ouroboros.Network.PeerSelection.Instances qualified as PeerSelection @@ -486,7 +479,7 @@ genNodeArgs relays minConnected localRootPeers relay = flip suchThat hasUpstream hasUpstream NodeArgs { naAddr, naPublicRoots, naLocalRootPeers } = not (Map.null $ naPublicRoots `Map.withoutKeys` - Set.fromList (maybeToList (ntnAddrToRelayAccessPoint naAddr))) + Set.fromList (maybeToList (Node.ntnAddrToRelayAccessPoint naAddr))) || any id [ v > 0 && not (Map.null m) | (HotValency v, _, m) <- naLocalRootPeers ] @@ -1117,11 +1110,11 @@ diffusionSimulation defaultMiniProtocolsLimit = MiniProtocolLimits { maximumIngressQueue = 64000 } - blockGeneratorArgs :: BlockGeneratorArgs Block StdGen + blockGeneratorArgs :: Node.BlockGeneratorArgs Block StdGen blockGeneratorArgs = - randomBlockGenerationArgs bgaSlotDuration - bgaRng - quota + Node.randomBlockGenerationArgs bgaSlotDuration + bgaRng + quota stdChainSyncTimeout :: ChainSyncTimeout stdChainSyncTimeout = do