Fix module duplication in library, tests and benchmarks

IntersectMBO · Sep 24, 2021 · 22d1002 · 22d1002
1 parent 71a9c60
commit 22d1002
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 34 deletions.
diff --git a/eras/shelley/test-suite/cardano-ledger-shelley-test.cabal b/eras/shelley/test-suite/cardano-ledger-shelley-test.cabal
@@ -33,13 +33,16 @@ common project-config
 library
   import:             base, project-config
   hs-source-dirs:     src
-                      test
   exposed-modules:
     Test.Cardano.Crypto.VRF.Fake
+    Test.Cardano.Ledger.Shelley.Address.Bootstrap
+    Test.Cardano.Ledger.Shelley.Address.CompactAddr
     Test.Cardano.Ledger.Shelley.BenchmarkFunctions
+    Test.Cardano.Ledger.Shelley.ByronTranslation
     Test.Cardano.Ledger.Shelley.ConcreteCryptoTypes
     Test.Cardano.Ledger.Shelley.Examples.Cast
     Test.Cardano.Ledger.Shelley.Examples.Consensus
+    Test.Cardano.Ledger.Shelley.Examples.Federation
     Test.Cardano.Ledger.Shelley.Generator.Block
     Test.Cardano.Ledger.Shelley.Generator.Constants
     Test.Cardano.Ledger.Shelley.Generator.Core
@@ -55,27 +58,22 @@ library
     Test.Cardano.Ledger.Shelley.Generator.ScriptClass
     Test.Cardano.Ledger.Shelley.Generator.ShelleyEraGen
     Test.Cardano.Ledger.Shelley.Orphans
+    Test.Cardano.Ledger.Shelley.PropertyTests
     Test.Cardano.Ledger.Shelley.Rules.ClassifyTraces
+    Test.Cardano.Ledger.Shelley.Rules.TestChain
+    Test.Cardano.Ledger.Shelley.Rules.TestDeleg
+    Test.Cardano.Ledger.Shelley.Rules.TestPool
+    Test.Cardano.Ledger.Shelley.Rules.TestPoolreap
     Test.Cardano.Ledger.Shelley.Serialisation.CDDLUtils
     Test.Cardano.Ledger.Shelley.Serialisation.Generators
     Test.Cardano.Ledger.Shelley.Serialisation.EraIndepGenerators
     Test.Cardano.Ledger.Shelley.Serialisation.Generators.Bootstrap
     Test.Cardano.Ledger.Shelley.Serialisation.Generators.Genesis
     Test.Cardano.Ledger.Shelley.Serialisation.GoldenUtils
+    Test.Cardano.Ledger.Shelley.ShelleyTranslation
     Test.Cardano.Ledger.Shelley.Shrinkers
     Test.Cardano.Ledger.Shelley.Utils
-    Test.Cardano.Ledger.Shelley.PropertyTests
-    Test.Cardano.Ledger.Shelley.Rules.TestChain
     Test.TestScenario
-  other-modules:
-      Test.Cardano.Ledger.Shelley.Address.Bootstrap
-      Test.Cardano.Ledger.Shelley.Address.CompactAddr
-      Test.Cardano.Ledger.Shelley.ByronTranslation
-      Test.Cardano.Ledger.Shelley.Examples.Federation
-      Test.Cardano.Ledger.Shelley.Rules.TestDeleg
-      Test.Cardano.Ledger.Shelley.Rules.TestPool
-      Test.Cardano.Ledger.Shelley.Rules.TestPoolreap
-      Test.Cardano.Ledger.Shelley.ShelleyTranslation
   build-depends:
     base16-bytestring >= 1,
     bytestring,
@@ -125,14 +123,9 @@ test-suite cardano-ledger-shelley-test
   main-is:             Tests.hs
   other-modules:
       Test.Control.Iterate.SetAlgebra
-      Test.Cardano.Ledger.Shelley.Address.Bootstrap
-      Test.Cardano.Ledger.Shelley.Address.CompactAddr
-      Test.Cardano.Ledger.Shelley.ByronTranslation
       Test.Cardano.Ledger.Shelley.Examples
-      Test.Cardano.Ledger.Shelley.Examples.Cast
       Test.Cardano.Ledger.Shelley.Examples.Combinators
       Test.Cardano.Ledger.Shelley.Examples.EmptyBlock
-      Test.Cardano.Ledger.Shelley.Examples.Federation
       Test.Cardano.Ledger.Shelley.Examples.Init
       Test.Cardano.Ledger.Shelley.Examples.GenesisDelegation
       Test.Cardano.Ledger.Shelley.Examples.NetworkID
@@ -145,13 +138,7 @@ test-suite cardano-ledger-shelley-test
       Test.Cardano.Ledger.Shelley.Fees
       Test.Cardano.Ledger.Shelley.MultiSigExamples
       Test.Cardano.Ledger.Shelley.Pretty
-      Test.Cardano.Ledger.Shelley.PropertyTests
       Test.Cardano.Ledger.Shelley.Rewards
-      Test.Cardano.Ledger.Shelley.Rules.ClassifyTraces
-      Test.Cardano.Ledger.Shelley.Rules.TestChain
-      Test.Cardano.Ledger.Shelley.Rules.TestDeleg
-      Test.Cardano.Ledger.Shelley.Rules.TestPool
-      Test.Cardano.Ledger.Shelley.Rules.TestPoolreap
       Test.Cardano.Ledger.Shelley.SafeHash
       Test.Cardano.Ledger.Shelley.Serialisation
       Test.Cardano.Ledger.Shelley.Serialisation.CDDL
@@ -160,10 +147,8 @@ test-suite cardano-ledger-shelley-test
       Test.Cardano.Ledger.Shelley.Serialisation.Golden.Genesis
       Test.Cardano.Ledger.Shelley.Serialisation.Tripping.CBOR
       Test.Cardano.Ledger.Shelley.Serialisation.Tripping.JSON
-      Test.Cardano.Ledger.Shelley.ShelleyTranslation
       Test.Cardano.Ledger.Shelley.RulesTests
       Test.Cardano.Ledger.Shelley.UnitTests
-      Test.TestScenario
 
   hs-source-dirs:      test
   ghc-options:
@@ -184,10 +169,6 @@ test-suite cardano-ledger-shelley-test
       cardano-binary,
       cardano-crypto-class,
       cardano-crypto-praos,
-      cardano-crypto-test,
-      cardano-crypto-wrapper,
-      cardano-crypto,
-      cardano-ledger-byron-test,
       cardano-ledger-byron,
       cardano-ledger-core,
       cardano-prelude-test,
@@ -199,7 +180,6 @@ test-suite cardano-ledger-shelley-test
       data-default-class,
       groups,
       hedgehog >= 1.0.4,
-      hedgehog-quickcheck,
       iproute,
       prettyprinter,
       QuickCheck,
@@ -215,7 +195,6 @@ test-suite cardano-ledger-shelley-test
       tasty,
       time,
       transformers,
-      tree-diff
 
 
 benchmark mainbench
@@ -224,18 +203,15 @@ benchmark mainbench
   type:             exitcode-stdio-1.0
   hs-source-dirs:
     bench
-    test
   main-is:          Main.hs
   other-modules:
     Bench.Control.Iterate.SetAlgebra.Bimap,
     BenchUTxOAggregate,
     BenchValidation,
     Cardano.Ledger.Shelley.Bench.Gen
     Cardano.Ledger.Shelley.Bench.Rewards
-    Test.Cardano.Ledger.Shelley.Examples.Cast
 
   build-depends:
-    bytestring,
     cardano-crypto-class,
     cardano-crypto-praos,
     cardano-ledger-core,

diff --git a/...rdano/Ledger/Shelley/Address/Bootstrap.hs → ...rdano/Ledger/Shelley/Address/Bootstrap.hs b/...rdano/Ledger/Shelley/Address/Bootstrap.hs → ...rdano/Ledger/Shelley/Address/Bootstrap.hs
diff --git a/...ano/Ledger/Shelley/Address/CompactAddr.hs → ...ano/Ledger/Shelley/Address/CompactAddr.hs b/...ano/Ledger/Shelley/Address/CompactAddr.hs → ...ano/Ledger/Shelley/Address/CompactAddr.hs
diff --git a/...ardano/Ledger/Shelley/ByronTranslation.hs → ...ardano/Ledger/Shelley/ByronTranslation.hs b/...ardano/Ledger/Shelley/ByronTranslation.hs → ...ardano/Ledger/Shelley/ByronTranslation.hs
diff --git a/...t/Cardano/Ledger/Shelley/Examples/Cast.hs → ...t/Cardano/Ledger/Shelley/Examples/Cast.hs b/...t/Cardano/Ledger/Shelley/Examples/Cast.hs → ...t/Cardano/Ledger/Shelley/Examples/Cast.hs
diff --git a/...ano/Ledger/Shelley/Examples/Federation.hs → ...ano/Ledger/Shelley/Examples/Federation.hs b/...ano/Ledger/Shelley/Examples/Federation.hs → ...ano/Ledger/Shelley/Examples/Federation.hs
diff --git a/...t/Cardano/Ledger/Shelley/PropertyTests.hs → ...t/Cardano/Ledger/Shelley/PropertyTests.hs b/...t/Cardano/Ledger/Shelley/PropertyTests.hs → ...t/Cardano/Ledger/Shelley/PropertyTests.hs
diff --git a/...no/Ledger/Shelley/Rules/ClassifyTraces.hs → ...no/Ledger/Shelley/Rules/ClassifyTraces.hs b/...no/Ledger/Shelley/Rules/ClassifyTraces.hs → ...no/Ledger/Shelley/Rules/ClassifyTraces.hs
diff --git a/...Cardano/Ledger/Shelley/Rules/TestChain.hs → ...Cardano/Ledger/Shelley/Rules/TestChain.hs b/...Cardano/Ledger/Shelley/Rules/TestChain.hs → ...Cardano/Ledger/Shelley/Rules/TestChain.hs
diff --git a/...Cardano/Ledger/Shelley/Rules/TestDeleg.hs → ...Cardano/Ledger/Shelley/Rules/TestDeleg.hs b/...Cardano/Ledger/Shelley/Rules/TestDeleg.hs → ...Cardano/Ledger/Shelley/Rules/TestDeleg.hs
diff --git a/.../Cardano/Ledger/Shelley/Rules/TestPool.hs → .../Cardano/Ledger/Shelley/Rules/TestPool.hs b/.../Cardano/Ledger/Shelley/Rules/TestPool.hs → .../Cardano/Ledger/Shelley/Rules/TestPool.hs
diff --git a/...dano/Ledger/Shelley/Rules/TestPoolreap.hs → ...dano/Ledger/Shelley/Rules/TestPoolreap.hs b/...dano/Ledger/Shelley/Rules/TestPoolreap.hs → ...dano/Ledger/Shelley/Rules/TestPoolreap.hs
diff --git a/...dano/Ledger/Shelley/ShelleyTranslation.hs → ...dano/Ledger/Shelley/ShelleyTranslation.hs b/...dano/Ledger/Shelley/ShelleyTranslation.hs → ...dano/Ledger/Shelley/ShelleyTranslation.hs
diff --git a/...lley/test-suite/test/Test/TestScenario.hs → ...elley/test-suite/src/Test/TestScenario.hs b/...lley/test-suite/test/Test/TestScenario.hs → ...elley/test-suite/src/Test/TestScenario.hs