Skip to content

Commit

Permalink
Merge pull request #5078 from IntersectMBO/coot/organise-imports
Browse files Browse the repository at this point in the history 
testnet: organised imports
  • Loading branch information
@bolt12
bolt12 authored Feb 12, 2025
2 parents 87bd453 + 1f07e03 commit 01f9bbf
Show file tree
Hide file tree
Showing 6 changed files with 132 additions and 140 deletions.
2 changes: 2 additions & 0 deletions ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/ChainDB.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ module Test.Ouroboros.Network.Diffusion.Node.ChainDB
) where

import Control.Concurrent.Class.MonadSTM (MonadSTM (..))

import Data.Coerce (coerce)
import Data.Map (Map)
import Data.Map qualified as Map
import Data.Set (Set)
import Data.Set qualified as Set

import Ouroboros.Network.AnchoredFragment (Point)
import Ouroboros.Network.Block (ChainHash (..), HasFullHeader, HasHeader,
blockHash, blockPoint, blockPrevHash)
Expand Down
30 changes: 13 additions & 17 deletions ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/Kernel.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ module Test.Ouroboros.Network.Diffusion.Node.Kernel
, NodeKernelError (..)
) where

import GHC.Generics (Generic)

import Control.Applicative (Alternative)
import Control.Concurrent.Class.MonadSTM qualified as LazySTM
import Control.Concurrent.Class.MonadSTM.Strict
Expand All @@ -41,53 +39,51 @@ import Control.Monad.Class.MonadAsync
import Control.Monad.Class.MonadThrow
import Control.Monad.Class.MonadTime.SI
import Control.Monad.Class.MonadTimer.SI

import Codec.CBOR.Decoding qualified as CBOR
import Codec.CBOR.Encoding qualified as CBOR
import Data.ByteString.Char8 qualified as BSC
import Data.Hashable (Hashable)
import Data.IP (IP (..), fromIPv4w, fromIPv6w, toIPv4, toIPv4w, toIPv6, toIPv6w)
import Data.IP qualified as IP
import Data.Map.Strict (Map)
import Data.Map.Strict qualified as Map
import Data.Monoid.Synchronisation
import Data.Typeable (Typeable)
import Data.Void (Void)
import GHC.Generics (Generic)
import Numeric.Natural (Natural)

import System.Random (RandomGen, StdGen, randomR, split)

import Data.Monoid.Synchronisation

import Network.Socket (PortNumber)

import Ouroboros.Network.AnchoredFragment (Anchor (..))
import Ouroboros.Network.Block (HasFullHeader, SlotNo)
import Ouroboros.Network.Block qualified as Block
import Ouroboros.Network.BlockFetch
import Ouroboros.Network.Handshake.Acceptable (Accept (..), Acceptable (..))
import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
import Ouroboros.Network.Protocol.Handshake.Unversioned
import Ouroboros.Network.Snocket (TestAddress (..))

import Ouroboros.Network.Mock.Chain (Chain (..))
import Ouroboros.Network.Mock.Chain qualified as Chain
import Ouroboros.Network.Mock.ConcreteBlock (Block)
import Ouroboros.Network.Mock.ConcreteBlock qualified as ConcreteBlock
import Ouroboros.Network.Mock.ProducerState

import Simulation.Network.Snocket (AddressType (..), GlobalAddressScheme (..))

import Test.Ouroboros.Network.Orphans ()

import Codec.CBOR.Decoding qualified as CBOR
import Codec.CBOR.Encoding qualified as CBOR
import Ouroboros.Network.Mock.Chain (Chain (..))
import Ouroboros.Network.NodeToNode ()
import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
import Ouroboros.Network.PeerSelection.Governor (PublicPeerSelectionState,
makePublicPeerSelectionStateVar)
import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing)
import Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint (..))
import Ouroboros.Network.PeerSharing (PeerSharingAPI, PeerSharingRegistry (..),
newPeerSharingAPI, newPeerSharingRegistry,
ps_POLICY_PEER_SHARE_MAX_PEERS, ps_POLICY_PEER_SHARE_STICKY_TIME)
import Ouroboros.Network.Protocol.Handshake.Unversioned
import Ouroboros.Network.Snocket (TestAddress (..))

import Simulation.Network.Snocket (AddressType (..), GlobalAddressScheme (..))

import Test.Ouroboros.Network.Diffusion.Node.ChainDB (ChainDB (..))
import Test.Ouroboros.Network.Diffusion.Node.ChainDB qualified as ChainDB
import Test.Ouroboros.Network.Orphans ()
import Test.QuickCheck (Arbitrary (..), choose, chooseInt, frequency, oneof)


Expand Down
30 changes: 13 additions & 17 deletions ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,26 @@ import Control.Monad.Class.MonadThrow
import Control.Monad.Class.MonadTime.SI
import Control.Monad.Class.MonadTimer.SI
import Control.Tracer (Tracer (..), contramap, nullTracer)

import Codec.CBOR.Read qualified as CBOR
import Codec.Serialise qualified as Serialise
import Data.ByteString.Lazy (ByteString)
import Data.Functor (($>))
import Data.Maybe (fromMaybe)
import Data.Monoid.Synchronisation
import Data.Void (Void)
import Pipes qualified
import System.Random (RandomGen, StdGen)

import Codec.CBOR.Read qualified as CBOR
import Codec.Serialise qualified as Serialise

import Network.Mux qualified as Mx
import Network.TypedProtocol
import Network.TypedProtocol.Codec
import Network.TypedProtocol.PingPong.Client as PingPong
import Network.TypedProtocol.PingPong.Codec.CBOR
import Network.TypedProtocol.PingPong.Examples
import Network.TypedProtocol.PingPong.Server
import Network.TypedProtocol.PingPong.Type

import Ouroboros.Network.BlockFetch
import Ouroboros.Network.BlockFetch.Client
import Ouroboros.Network.Protocol.BlockFetch.Codec
Expand All @@ -63,32 +68,21 @@ import Ouroboros.Network.Protocol.KeepAlive.Codec
import Ouroboros.Network.Protocol.KeepAlive.Server
import Ouroboros.Network.Protocol.KeepAlive.Type

import Data.Monoid.Synchronisation

import Ouroboros.Network.Block (HasHeader, HeaderHash, Point)
import Ouroboros.Network.Block qualified as Block
import Ouroboros.Network.Context
import Ouroboros.Network.ControlMessage (ControlMessage (..))
import Ouroboros.Network.Diffusion.Common qualified as Common
import Ouroboros.Network.Driver.Limits
import Ouroboros.Network.KeepAlive
import Ouroboros.Network.Mock.Chain qualified as Chain
import Ouroboros.Network.Mock.ConcreteBlock
import Ouroboros.Network.Mock.ProducerState
import Ouroboros.Network.Mux
import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
import Ouroboros.Network.Util.ShowProxy

import Ouroboros.Network.Mock.ConcreteBlock

import Network.TypedProtocol

import Network.Mux qualified as Mx

import Pipes qualified

import Ouroboros.Network.Diffusion.Common qualified as Common
import Ouroboros.Network.NodeToNode (blockFetchMiniProtocolNum,
chainSyncMiniProtocolNum, keepAliveMiniProtocolNum,
peerSharingMiniProtocolNum)
import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
import Ouroboros.Network.PeerSelection.LedgerPeers
import Ouroboros.Network.PeerSelection.PeerSharing qualified as PSTypes
import Ouroboros.Network.PeerSharing (PeerSharingAPI, bracketPeerSharingClient,
Expand All @@ -97,6 +91,8 @@ import Ouroboros.Network.Protocol.PeerSharing.Client (peerSharingClientPeer)
import Ouroboros.Network.Protocol.PeerSharing.Codec (codecPeerSharing)
import Ouroboros.Network.Protocol.PeerSharing.Server (peerSharingServerPeer)
import Ouroboros.Network.Protocol.PeerSharing.Type (PeerSharing)
import Ouroboros.Network.Util.ShowProxy

import Test.Ouroboros.Network.Diffusion.Node.Kernel


Expand Down
60 changes: 30 additions & 30 deletions ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,75 +39,75 @@ import Data.Time (secondsToDiffTime)
import Data.Typeable (Typeable)
import Data.Void (Void)
import Data.Word (Word32)

import GHC.IO.Exception (IOErrorType (..), IOException (..))
import System.Random (mkStdGen)

import Network.DNS.Types qualified as DNS
import Network.Mux.Trace qualified as Mx

import Cardano.Network.ConsensusMode
import Cardano.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..),
requiresBootstrapPeers)
import Cardano.Network.PeerSelection.PeerTrustable (PeerTrustable (..))
import Cardano.Network.Types (LedgerStateJudgement, NumberOfBigLedgerPeers (..))

import Ouroboros.Cardano.Network.PeerSelection.Governor.PeerSelectionState qualified as Cardano
import Ouroboros.Cardano.Network.PeerSelection.Governor.PeerSelectionState qualified as ExtraState
import Ouroboros.Cardano.Network.PublicRootPeers qualified as Cardano
import Ouroboros.Cardano.Network.PublicRootPeers qualified as ExtraPeers

import Ouroboros.Network.Block (BlockNo (..))
import Ouroboros.Network.BlockFetch (PraosFetchMode (..),
TraceFetchClientState (..))
import Ouroboros.Network.ConnectionHandler (ConnectionHandlerTrace (..))
import Ouroboros.Network.ConnectionId
import Ouroboros.Network.ConnectionManager.Core qualified as CM
import Ouroboros.Network.ConnectionManager.State qualified as CM
import Ouroboros.Network.ConnectionManager.Types
import Ouroboros.Network.Diffusion.P2P (isFatal)
import Ouroboros.Network.ExitPolicy (RepromoteDelay (..))
import Ouroboros.Network.InboundGovernor qualified as IG
import Ouroboros.Network.Mock.ConcreteBlock (BlockHeader)
import Ouroboros.Network.NodeToNode (DiffusionMode (..))
import Ouroboros.Network.PeerSelection.Governor hiding (PeerSelectionState (..))
import Ouroboros.Network.PeerSelection.Governor qualified as Governor
import Ouroboros.Network.PeerSelection.LedgerPeers
import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..))
import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
import Ouroboros.Network.PeerSelection.PeerStateActions
import Ouroboros.Network.PeerSelection.PublicRootPeers qualified as PublicRootPeers
import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSActions hiding (IOError)
import Ouroboros.Network.PeerSelection.RootPeersDNS.LocalRootPeers
(TraceLocalRootPeers (..))
import Ouroboros.Network.PeerSelection.State.EstablishedPeers qualified as EstablishedPeers
import Ouroboros.Network.PeerSelection.State.KnownPeers qualified as KnownPeers
import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency (..),
LocalRootConfig (..), WarmValency (..))
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 Test.Ouroboros.Network.ConnectionManager.Timeouts
import Test.Ouroboros.Network.ConnectionManager.Utils
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.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)

import Simulation.Network.Snocket (BearerInfo (..))

import Test.Ouroboros.Network.Diffusion.Node.Kernel
import Test.Ouroboros.Network.Diffusion.Testnet.Cardano.Simulation
import Test.QuickCheck
import Test.QuickCheck.Monoids
import Test.Tasty
import Test.Tasty.QuickCheck (testProperty)

import Cardano.Network.ConsensusMode
import Cardano.Network.PeerSelection.PeerTrustable (PeerTrustable (..))
import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..))
import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
import Ouroboros.Network.PeerSelection.PublicRootPeers qualified as PublicRootPeers
import Ouroboros.Network.PeerSelection.RootPeersDNS.LocalRootPeers
(TraceLocalRootPeers (..))
import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency (..),
LocalRootConfig (..), WarmValency (..))
import Ouroboros.Network.PeerSharing (PeerSharingResult (..))
import Ouroboros.Network.Server2 qualified as Server

import Cardano.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..),
requiresBootstrapPeers)
import Cardano.Network.Types (LedgerStateJudgement, NumberOfBigLedgerPeers (..))
import Ouroboros.Cardano.Network.PeerSelection.Governor.PeerSelectionState qualified as Cardano
import Ouroboros.Cardano.Network.PeerSelection.Governor.PeerSelectionState qualified as ExtraState
import Ouroboros.Cardano.Network.PublicRootPeers qualified as Cardano
import Ouroboros.Cardano.Network.PublicRootPeers qualified as ExtraPeers
import Ouroboros.Network.Block (BlockNo (..))
import Ouroboros.Network.Diffusion.P2P (isFatal)
import Test.Ouroboros.Network.ConnectionManager.Timeouts
import Test.Ouroboros.Network.ConnectionManager.Utils
import Test.Ouroboros.Network.Diffusion.Testnet.Node (config_REPROMOTE_DELAY)
import Test.Ouroboros.Network.InboundGovernor.Utils
import Test.Ouroboros.Network.LedgerPeers (LedgerPools (..))

tests :: TestTree
tests =
testGroup "Ouroboros.Network.Testnet"
Expand Down
Loading

0 comments on commit 01f9bbf

Please sign in to comment.