Skip to content

Commit 44aef75

Browse files
MarcFontaineMarcFontaine
committed
Reorder module hierarchy
1 parent 9d91363 commit 44aef75

27 files changed

+117
-262
lines changed

‎cardano-node-chairman/test/Spec/Chairman/Byron.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import qualified Hedgehog as H
1414
import qualified Hedgehog.Extras.Test.Base as H
1515
import qualified Hedgehog.Extras.Test.Process as H
1616
import qualified System.Directory as IO
17-
import qualified Test.Base as H
1817
import qualified Testnet.Byron as H
1918
import qualified Testnet.Conf as H
19+
import qualified Util.Base as H
2020

2121
{- HLINT ignore "Reduce duplication" -}
2222
{- HLINT ignore "Redundant <&>" -}

‎cardano-node-chairman/test/Spec/Chairman/Cardano.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import qualified Hedgehog as H
1717
import qualified Hedgehog.Extras.Test.Base as H
1818
import qualified Hedgehog.Extras.Test.Process as H
1919
import qualified System.Directory as IO
20-
import qualified Test.Base as H
21-
import qualified Test.Runtime as H
2220
import qualified Testnet.Cardano as H
2321
import qualified Testnet.Conf as H
22+
import qualified Util.Base as H
23+
import qualified Util.Runtime as H
2424

2525
{- HLINT ignore "Reduce duplication" -}
2626
{- HLINT ignore "Redundant <&>" -}

‎cardano-node-chairman/test/Spec/Chairman/Chairman.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import qualified Hedgehog.Extras.Test.Process as H
3131
import qualified System.Environment as IO
3232
import qualified System.IO as IO
3333
import qualified System.Process as IO
34-
import qualified Test.Process as H
3534
import qualified Testnet.Conf as H
35+
import qualified Util.Process as H
3636

3737
{- HLINT ignore "Reduce duplication" -}
3838
{- HLINT ignore "Redundant <&>" -}

‎cardano-node-chairman/test/Spec/Chairman/Shelley.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import qualified Hedgehog as H
1212
import qualified Hedgehog.Extras.Test.Base as H
1313
import qualified Hedgehog.Extras.Test.Process as H
1414
import qualified System.Directory as IO
15-
import qualified Test.Base as H
16-
import qualified Test.Runtime as H
1715
import qualified Testnet.Conf as H
1816
import qualified Testnet.Shelley as H
17+
import qualified Util.Base as H
18+
import qualified Util.Runtime as H
1919

2020
hprop_chairman :: H.Property
2121
hprop_chairman = H.integration . H.runFinallies . H.workspace "chairman" $ \tempAbsPath' -> do

‎cardano-testnet/cardano-testnet.cabal

+19-21
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ library
3030

3131
build-depends: aeson
3232
, ansi-terminal
33-
, base16-bytestring
3433
, bytestring
3534
, cardano-api
3635
, cardano-cli
@@ -42,15 +41,16 @@ library
4241
, filepath
4342
, hedgehog
4443
, hedgehog-extras
45-
, http-client
46-
, http-types
4744
, optparse-applicative-fork
4845
, ouroboros-network
4946
, process
5047
, random
5148
, resourcet
5249
, safe-exceptions
5350
, stm
51+
, tasty
52+
, tasty-expected-failure
53+
, tasty-hedgehog
5454
, text
5555
, time
5656
, transformers
@@ -63,18 +63,18 @@ library
6363
Parsers.Cardano
6464
Parsers.Shelley
6565
Parsers.Version
66-
Test.Assert
67-
Test.Base
68-
Test.Process
69-
Test.Runtime
66+
Util.Assert
67+
Util.Base
68+
Util.Ignore
69+
Util.Process
70+
Util.Runtime
7071
Testnet
7172
Testnet.Babbage
7273
Testnet.Byron
7374
Testnet.Cardano
7475
Testnet.Conf
7576
Testnet.Run
7677
Testnet.Shelley
77-
Testnet.SubmitApi
7878
Testnet.Utils
7979

8080
other-modules: Paths_cardano_testnet
@@ -100,33 +100,31 @@ test-suite cardano-testnet-tests
100100

101101
main-is: Main.hs
102102

103+
other-modules: Test.Cli.Alonzo.LeadershipSchedule
104+
Test.Cli.Babbage.LeadershipSchedule
105+
Test.Cli.KesPeriodInfo
106+
Test.Misc
107+
Test.Node.Shutdown
108+
Test.ShutdownOnSlotSynced
109+
103110
type: exitcode-stdio-1.0
104111

105-
build-depends: cardano-testnet
106-
, aeson >= 2.1.0.0
112+
build-depends: aeson
107113
, cardano-api
108114
, cardano-cli
115+
, cardano-testnet
109116
, containers
110117
, directory
111118
, filepath
112-
, hedgehog
119+
, hedgehog
113120
, hedgehog-extras
114121
, process
115122
, tasty
116-
, tasty-expected-failure
117-
, tasty-hedgehog
118123
, text
119124
, time
120125

126+
121127
other-modules:
122-
Spec.Cli.Alonzo.LeadershipSchedule
123-
Spec.Cli.Babbage.LeadershipSchedule
124-
Spec.Cli.KesPeriodInfo
125-
Spec.Node.Shutdown
126-
Spec.ShutdownOnSlotSynced
127-
Testnet.Properties.Cli.KesPeriodInfo
128-
129-
Test.Util
130128

131129
ghc-options: -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T
132130

‎cardano-testnet/src/Parsers/Babbage.hs

+4-10
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,14 @@ module Parsers.Babbage
44
, runBabbageOptions
55
) where
66

7-
import Data.Eq
8-
import Data.Function
9-
import Data.Int
10-
import Data.Maybe
11-
import Data.Semigroup
7+
import Prelude
128
import Options.Applicative
13-
import System.IO (IO)
14-
import Test.Runtime (readNodeLoggingFormat)
9+
import qualified Options.Applicative as OA
10+
1511
import Testnet
1612
import Testnet.Babbage
1713
import Testnet.Run (runTestnet)
18-
import Text.Show
19-
20-
import qualified Options.Applicative as OA
14+
import Util.Runtime (readNodeLoggingFormat)
2115

2216
data BabbageOptions = BabbageOptions
2317
{ maybeTestnetMagic :: Maybe Int

‎cardano-testnet/src/Parsers/Cardano.hs

+6-12
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,17 @@ module Parsers.Cardano
66
, runCardanoOptions
77
) where
88

9-
import Data.Eq
10-
import Data.Function
11-
import Data.Int
12-
import Data.Maybe
13-
import Data.Semigroup
14-
import GHC.Enum
9+
import Prelude
10+
import qualified Data.List as L
1511
import Options.Applicative
16-
import System.IO (IO)
17-
import Test.Runtime (readNodeLoggingFormat)
12+
import qualified Options.Applicative as OA
13+
import Text.Read
14+
15+
import Util.Runtime (readNodeLoggingFormat)
1816
import Testnet
1917
import Testnet.Cardano
2018
import Testnet.Run (runTestnet)
21-
import Text.Read
22-
import Text.Show
2319

24-
import qualified Data.List as L
25-
import qualified Options.Applicative as OA
2620

2721
data CardanoOptions = CardanoOptions
2822
{ maybeTestnetMagic :: Maybe Int

‎cardano-testnet/src/Testnet/Babbage.hs

+7-6
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ import Data.Aeson (encode, object, toJSON, (.=))
2525
import Hedgehog.Extras.Stock.Time (showUTCTimeSeconds)
2626
import System.FilePath.Posix ((</>))
2727

28-
import Test.Runtime (Delegator (..), NodeLoggingFormat (..), PaymentKeyPair (..),
29-
PoolNode (PoolNode), PoolNodeKeys (..), StakingKeyPair (..),
30-
TestnetRuntime (..), startNode)
31-
3228
import qualified Data.HashMap.Lazy as HM
3329
import qualified Data.List as L
3430
import qualified Data.Time.Clock as DTC
@@ -37,10 +33,15 @@ import qualified Hedgehog.Extras.Stock.OS as OS
3733
import qualified Hedgehog.Extras.Test.Base as H
3834
import qualified Hedgehog.Extras.Test.File as H
3935
import qualified System.Info as OS
40-
import qualified Test.Assert as H
36+
37+
import qualified Util.Assert as H
38+
import Util.Process (execCli_)
39+
import Util.Runtime (Delegator (..), NodeLoggingFormat (..), PaymentKeyPair (..),
40+
PoolNode (PoolNode), PoolNodeKeys (..), StakingKeyPair (..),
41+
TestnetRuntime (..), startNode)
4142
import qualified Testnet.Conf as H
4243

43-
import Test.Process (execCli_)
44+
4445

4546
{- HLINT ignore "Redundant flip" -}
4647

‎cardano-testnet/src/Testnet/Byron.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ import qualified Hedgehog.Extras.Test.Process as H
5252
import qualified System.Info as OS
5353
import qualified System.IO as IO
5454
import qualified System.Process as IO
55-
import qualified Test.Process as H
5655
import qualified Testnet.Conf as H
56+
import qualified Util.Process as H
5757

5858
{- HLINT ignore "Reduce duplication" -}
5959
{- HLINT ignore "Redundant <&>" -}

‎cardano-testnet/src/Testnet/Cardano.hs

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ import Hedgehog.Extras.Stock.Time (formatIso8601, showUTCTimeSeconds)
3030
import Ouroboros.Network.PeerSelection.LedgerPeers (UseLedgerAfter (..))
3131
import Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint (..))
3232
import System.FilePath.Posix ((</>))
33-
import Test.Runtime as TR (NodeLoggingFormat (..), PaymentKeyPair (..), PoolNode (PoolNode),
34-
PoolNodeKeys (..), TestnetRuntime (..), startNode)
35-
36-
import Test.Process (execCli_)
3733

3834
import qualified Cardano.Node.Configuration.Topology as NonP2P
3935
import qualified Cardano.Node.Configuration.TopologyP2P as P2P
@@ -53,8 +49,12 @@ import qualified Hedgehog.Extras.Test.File as H
5349
import qualified Hedgehog.Extras.Test.Network as H
5450
import qualified System.Directory as IO
5551
import qualified System.Info as OS
56-
import qualified Test.Assert as H
57-
import qualified Test.Process as H
52+
import qualified Util.Assert as H
53+
import qualified Util.Process as H
54+
import Util.Process (execCli_)
55+
import Util.Runtime as TR (NodeLoggingFormat (..), PaymentKeyPair (..), PoolNode (PoolNode),
56+
PoolNodeKeys (..), TestnetRuntime (..), startNode)
57+
5858
import qualified Testnet.Conf as H
5959

6060
{- HLINT ignore "Redundant flip" -}

‎cardano-testnet/src/Testnet/Conf.hs

-13
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,13 @@ module Testnet.Conf
66
, YamlFilePath(..)
77
, Conf(..)
88
, mkConf
9-
10-
, SubmitApiConfig(..)
119
) where
1210

1311
import Control.Monad
1412
import Data.Eq
1513
import Data.Function
1614
import Data.Int
1715
import Data.Maybe
18-
import Hedgehog.Extras.Stock.IO.Network.Sprocket (Sprocket (..))
1916
import System.FilePath.Posix ((</>))
2017
import System.IO (FilePath)
2118
import Text.Show
@@ -52,13 +49,3 @@ mkConf (ProjectBase base) (YamlFilePath configurationTemplate) tempAbsPath maybe
5249
logDir <- H.noteTempFile tempAbsPath "logs"
5350

5451
return $ Conf {..}
55-
56-
data SubmitApiConfig = SubmitApiConfig
57-
{ tempBaseAbsPath :: FilePath
58-
, base :: FilePath
59-
, configFile :: FilePath
60-
, sprocket :: Sprocket
61-
, testnetMagic :: Int
62-
, stdoutFile :: FilePath
63-
, stderrFile :: FilePath
64-
} deriving (Eq, Show)

‎cardano-testnet/src/Testnet/Run.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import qualified System.Console.ANSI as ANSI
2222
import qualified System.Directory as IO
2323
import qualified System.Exit as IO
2424
import qualified System.IO as IO
25-
import qualified Test.Base as H
2625
import qualified Testnet.Conf as H
26+
import qualified Util.Base as H
2727

2828
testnetProperty :: Maybe Int -> (H.Conf -> H.Integration ()) -> H.Property
2929
testnetProperty maybeTestnetMagic tn = H.integration . H.runFinallies . H.workspace "chairman" $ \tempAbsPath' -> do

‎cardano-testnet/src/Testnet/Shelley.hs

+5-4
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import Hedgehog.Extras.Stock.IO.Network.Sprocket (Sprocket(..))
2828
import Ouroboros.Network.PeerSelection.LedgerPeers (UseLedgerAfter(..))
2929
import Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint(..))
3030
import System.FilePath.Posix ((</>))
31-
import Test.Process (execCli_)
32-
import Test.Runtime hiding (allNodes)
3331

3432
import qualified Cardano.Node.Configuration.Topology as NonP2P
3533
import qualified Cardano.Node.Configuration.TopologyP2P as P2P
@@ -52,9 +50,12 @@ import qualified Hedgehog.Extras.Test.Network as H
5250
import qualified Hedgehog.Extras.Test.Process as H
5351
import qualified System.Directory as IO
5452
import qualified System.Info as OS
55-
import qualified Test.Base as H
56-
import qualified Test.Process as H
5753
import qualified Testnet.Conf as H
54+
import qualified Util.Base as H
55+
import qualified Util.Process as H
56+
import Util.Process (execCli_)
57+
import Util.Runtime hiding (allNodes)
58+
5859

5960
{- HLINT ignore "Redundant <&>" -}
6061
{- HLINT ignore "Redundant flip" -}

0 commit comments

Comments
 (0)