Merge #4580

4580: Remove testnet subdir r=MarcFontaine a=MarcFontaine Move the modules from `testnet` to `src`. Co-authored-by: MarcFontaine <[email protected]>
IntersectMBO · Nov 2, 2022 · 9d91363 · 9d91363
2 parents acf0859 + f6b84ac
commit 9d91363
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 49 deletions.
diff --git a/cardano-testnet/testnet/Main.hs → cardano-testnet/app/cardano-testnet.hs b/cardano-testnet/testnet/Main.hs → cardano-testnet/app/cardano-testnet.hs
@@ -5,7 +5,7 @@ import           Data.Function
 import           Data.Semigroup
 import           Options.Applicative
 import           System.IO (IO)
-import           Testnet.Commands
+import           Parsers
 
 main :: IO ()
 main = join $ customExecParser

diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal
@@ -29,10 +29,12 @@ library
   import:               base, project-config
 
   build-depends:        aeson
+                      , ansi-terminal
                       , base16-bytestring
                       , bytestring
                       , cardano-api
                       , cardano-cli
+                      , cardano-git-rev
                       , cardano-node
                       , containers
                       , directory
@@ -42,18 +44,26 @@ library
                       , hedgehog-extras
                       , http-client
                       , http-types
+                      , optparse-applicative-fork
                       , ouroboros-network
                       , process
                       , random
                       , resourcet
                       , safe-exceptions
+                      , stm
                       , text
                       , time
                       , transformers
                       , unordered-containers
 
   hs-source-dirs:       src
-  exposed-modules:      Test.Assert
+  exposed-modules:      Parsers
+                        Parsers.Babbage
+                        Parsers.Byron
+                        Parsers.Cardano
+                        Parsers.Shelley
+                        Parsers.Version
+                        Test.Assert
                         Test.Base
                         Test.Process
                         Test.Runtime
@@ -62,40 +72,24 @@ library
                         Testnet.Byron
                         Testnet.Cardano
                         Testnet.Conf
-                        Testnet.List
+                        Testnet.Run
                         Testnet.Shelley
                         Testnet.SubmitApi
                         Testnet.Utils
 
+  other-modules:        Paths_cardano_testnet
+
+  autogen-modules:      Paths_cardano_testnet
+
 executable cardano-testnet
   import:               base, project-config
 
-  hs-source-dirs:       testnet
+  hs-source-dirs:       app
 
-  main-is:              Main.hs
+  main-is:              cardano-testnet.hs
 
-  build-depends:        ansi-terminal
-                      , cardano-git-rev
-                      , cardano-testnet
-                      , directory
-                      , filepath
-                      , hedgehog
-                      , hedgehog-extras
+  build-depends:        cardano-testnet
                       , optparse-applicative-fork
-                      , resourcet
-                      , stm
-                      , text
-
-  other-modules:        Paths_cardano_testnet
-                        Testnet.Commands
-                        Testnet.Commands.Babbage
-                        Testnet.Commands.Byron
-                        Testnet.Commands.Cardano
-                        Testnet.Commands.Shelley
-                        Testnet.Commands.Version
-                        Testnet.Run
-
-  autogen-modules:      Paths_cardano_testnet
 
   ghc-options:          -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T
 

diff --git a/cardano-testnet/testnet/Testnet/Commands.hs → cardano-testnet/src/Parsers.hs b/cardano-testnet/testnet/Testnet/Commands.hs → cardano-testnet/src/Parsers.hs
@@ -1,14 +1,14 @@
-module Testnet.Commands where
+module Parsers where
 
 import           Data.Function
 import           Data.Monoid
 import           Options.Applicative
 import           System.IO (IO)
-import           Testnet.Commands.Babbage
-import           Testnet.Commands.Byron
-import           Testnet.Commands.Cardano
-import           Testnet.Commands.Shelley
-import           Testnet.Commands.Version
+import           Parsers.Babbage
+import           Parsers.Byron
+import           Parsers.Cardano
+import           Parsers.Shelley
+import           Parsers.Version
 
 {- HLINT ignore "Monoid law, left identity" -}
 

diff --git a/...stnet/testnet/Testnet/Commands/Babbage.hs → cardano-testnet/src/Parsers/Babbage.hs b/...stnet/testnet/Testnet/Commands/Babbage.hs → cardano-testnet/src/Parsers/Babbage.hs
@@ -1,4 +1,4 @@
-module Testnet.Commands.Babbage
+module Parsers.Babbage
   ( BabbageOptions(..)
   , cmdBabbage
   , runBabbageOptions

diff --git a/...testnet/testnet/Testnet/Commands/Byron.hs → cardano-testnet/src/Parsers/Byron.hs b/...testnet/testnet/Testnet/Commands/Byron.hs → cardano-testnet/src/Parsers/Byron.hs
@@ -1,4 +1,4 @@
-module Testnet.Commands.Byron
+module Parsers.Byron
   ( ByronOptions(..)
   , cmdByron
   , runByronOptions

diff --git a/...stnet/testnet/Testnet/Commands/Cardano.hs → cardano-testnet/src/Parsers/Cardano.hs b/...stnet/testnet/Testnet/Commands/Cardano.hs → cardano-testnet/src/Parsers/Cardano.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeApplications #-}
 
-module Testnet.Commands.Cardano
+module Parsers.Cardano
   ( CardanoOptions(..)
   , cmdCardano
   , runCardanoOptions

diff --git a/...stnet/testnet/Testnet/Commands/Shelley.hs → cardano-testnet/src/Parsers/Shelley.hs b/...stnet/testnet/Testnet/Commands/Shelley.hs → cardano-testnet/src/Parsers/Shelley.hs
@@ -1,4 +1,4 @@
-module Testnet.Commands.Shelley
+module Parsers.Shelley
   ( ShelleyOptions(..)
   , cmdShelley
   , runShelleyOptions

diff --git a/...stnet/testnet/Testnet/Commands/Version.hs → cardano-testnet/src/Parsers/Version.hs b/...stnet/testnet/Testnet/Commands/Version.hs → cardano-testnet/src/Parsers/Version.hs
@@ -1,4 +1,4 @@
-module Testnet.Commands.Version
+module Parsers.Version
   ( VersionOptions(..)
   , cmdVersion
   , runVersionOptions

diff --git a/cardano-testnet/src/Testnet/List.hs b/cardano-testnet/src/Testnet/List.hs
diff --git a/cardano-testnet/testnet/Testnet/Run.hs → cardano-testnet/src/Testnet/Run.hs b/cardano-testnet/testnet/Testnet/Run.hs → cardano-testnet/src/Testnet/Run.hs