Merge #3613

3613: Prevent directory name collisions due to case insensitivity. r=jonathanknowles a=jonathanknowles ## Issue Number #3593 (review) ## Summary This PR reworks the directory structure of `primitive`, `coin-selection`, and `balance-tx` to prevent directory name collisions on systems that suffer from case-insensitive path names. Co-authored-by: Jonathan Knowles <jonathan.knowles@iohk.io>
cardano-foundation · Nov 29, 2022 · 5efe75a · 5efe75a
2 parents 5c0d1ce + 10c26b4
commit 5efe75a
Show file tree

Hide file tree

Showing 28 changed files with 3 additions and 3 deletions.
diff --git a/lib/balance-tx/cardano-balance-tx.cabal b/lib/balance-tx/cardano-balance-tx.cabal
@@ -58,7 +58,7 @@ test-suite test
   import:             language, opts-exe
   ghc-options:        -with-rtsopts=-M2G -with-rtsopts=-N4
   type:               exitcode-stdio-1.0
-  hs-source-dirs:     test
+  hs-source-dirs:     test/data test/spec
   main-is:            run-test-suite.hs
   build-depends:
     , base

diff --git a/.../Tx/Balance/Internal/CoinSelectionSpec.hs → .../Tx/Balance/Internal/CoinSelectionSpec.hs b/.../Tx/Balance/Internal/CoinSelectionSpec.hs → .../Tx/Balance/Internal/CoinSelectionSpec.hs
diff --git a/lib/balance-tx/test/Spec.hs → lib/balance-tx/test/spec/Spec.hs b/lib/balance-tx/test/Spec.hs → lib/balance-tx/test/spec/Spec.hs
diff --git a/lib/balance-tx/test/run-test-suite.hs → lib/balance-tx/test/spec/run-test-suite.hs b/lib/balance-tx/test/run-test-suite.hs → lib/balance-tx/test/spec/run-test-suite.hs
diff --git a/lib/coin-selection/cardano-coin-selection.cabal b/lib/coin-selection/cardano-coin-selection.cabal
@@ -67,7 +67,7 @@ test-suite test
   import:             language, opts-exe
   ghc-options:        -with-rtsopts=-M2G -with-rtsopts=-N4
   type:               exitcode-stdio-1.0
-  hs-source-dirs:     test
+  hs-source-dirs:     test/data test/spec
   main-is:            run-test-suite.hs
   build-depends:
     , base

diff --git a/...test/Cardano/CoinSelection/BalanceSpec.hs → ...spec/Cardano/CoinSelection/BalanceSpec.hs b/...test/Cardano/CoinSelection/BalanceSpec.hs → ...spec/Cardano/CoinSelection/BalanceSpec.hs
diff --git a/...t/Cardano/CoinSelection/CollateralSpec.hs → ...c/Cardano/CoinSelection/CollateralSpec.hs b/...t/Cardano/CoinSelection/CollateralSpec.hs → ...c/Cardano/CoinSelection/CollateralSpec.hs
diff --git a/...lection/test/Cardano/CoinSelectionSpec.hs → ...on/test/spec/Cardano/CoinSelectionSpec.hs b/...lection/test/Cardano/CoinSelectionSpec.hs → ...on/test/spec/Cardano/CoinSelectionSpec.hs
diff --git a/lib/coin-selection/test/Spec.hs → lib/coin-selection/test/spec/Spec.hs b/lib/coin-selection/test/Spec.hs → lib/coin-selection/test/spec/Spec.hs
diff --git a/lib/coin-selection/test/run-test-suite.hs → ...oin-selection/test/spec/run-test-suite.hs b/lib/coin-selection/test/run-test-suite.hs → ...oin-selection/test/spec/run-test-suite.hs
diff --git a/lib/primitive/cardano-wallet-primitive.cabal b/lib/primitive/cardano-wallet-primitive.cabal
@@ -115,7 +115,7 @@ test-suite test
   import:             language, opts-exe
   ghc-options:        -with-rtsopts=-M2G -with-rtsopts=-N4
   type:               exitcode-stdio-1.0
-  hs-source-dirs:     test
+  hs-source-dirs:     test/data test/spec
   main-is:            run-test-suite.hs
   build-depends:
     , aeson

diff --git a/...ardano/Wallet/Primitive/CollateralSpec.hs → ...ardano/Wallet/Primitive/CollateralSpec.hs b/...ardano/Wallet/Primitive/CollateralSpec.hs → ...ardano/Wallet/Primitive/CollateralSpec.hs
diff --git a/...ano/Wallet/Primitive/Types/AddressSpec.hs → ...ano/Wallet/Primitive/Types/AddressSpec.hs b/...ano/Wallet/Primitive/Types/AddressSpec.hs → ...ano/Wallet/Primitive/Types/AddressSpec.hs
diff --git a/...ardano/Wallet/Primitive/Types/CoinSpec.hs → ...ardano/Wallet/Primitive/Types/CoinSpec.hs b/...ardano/Wallet/Primitive/Types/CoinSpec.hs → ...ardano/Wallet/Primitive/Types/CoinSpec.hs
diff --git a/...ardano/Wallet/Primitive/Types/HashSpec.hs → ...ardano/Wallet/Primitive/Types/HashSpec.hs b/...ardano/Wallet/Primitive/Types/HashSpec.hs → ...ardano/Wallet/Primitive/Types/HashSpec.hs
diff --git a/...Wallet/Primitive/Types/TokenBundleSpec.hs → ...Wallet/Primitive/Types/TokenBundleSpec.hs b/...Wallet/Primitive/Types/TokenBundleSpec.hs → ...Wallet/Primitive/Types/TokenBundleSpec.hs
diff --git a/...no/Wallet/Primitive/Types/TokenMapSpec.hs → ...no/Wallet/Primitive/Types/TokenMapSpec.hs b/...no/Wallet/Primitive/Types/TokenMapSpec.hs → ...no/Wallet/Primitive/Types/TokenMapSpec.hs
diff --git a/...itive/Types/TokenMapSpec/TypeErrorSpec.hs → ...itive/Types/TokenMapSpec/TypeErrorSpec.hs b/...itive/Types/TokenMapSpec/TypeErrorSpec.hs → ...itive/Types/TokenMapSpec/TypeErrorSpec.hs
diff --git a/...Wallet/Primitive/Types/TokenPolicySpec.hs → ...Wallet/Primitive/Types/TokenPolicySpec.hs b/...Wallet/Primitive/Types/TokenPolicySpec.hs → ...Wallet/Primitive/Types/TokenPolicySpec.hs
diff --git a/...llet/Primitive/Types/TokenQuantitySpec.hs → ...llet/Primitive/Types/TokenQuantitySpec.hs b/...llet/Primitive/Types/TokenQuantitySpec.hs → ...llet/Primitive/Types/TokenQuantitySpec.hs
diff --git a/...rimitive/Types/UTxOIndex/TypeErrorSpec.hs → ...rimitive/Types/UTxOIndex/TypeErrorSpec.hs b/...rimitive/Types/UTxOIndex/TypeErrorSpec.hs → ...rimitive/Types/UTxOIndex/TypeErrorSpec.hs
diff --git a/...o/Wallet/Primitive/Types/UTxOIndexSpec.hs → ...o/Wallet/Primitive/Types/UTxOIndexSpec.hs b/...o/Wallet/Primitive/Types/UTxOIndexSpec.hs → ...o/Wallet/Primitive/Types/UTxOIndexSpec.hs
diff --git a/...llet/Primitive/Types/UTxOSelectionSpec.hs → ...llet/Primitive/Types/UTxOSelectionSpec.hs b/...llet/Primitive/Types/UTxOSelectionSpec.hs → ...llet/Primitive/Types/UTxOSelectionSpec.hs
diff --git a/.../Types/UTxOSelectionSpec/TypeErrorSpec.hs → .../Types/UTxOSelectionSpec/TypeErrorSpec.hs b/.../Types/UTxOSelectionSpec/TypeErrorSpec.hs → .../Types/UTxOSelectionSpec/TypeErrorSpec.hs
diff --git a/...ardano/Wallet/Primitive/Types/UTxOSpec.hs → ...ardano/Wallet/Primitive/Types/UTxOSpec.hs b/...ardano/Wallet/Primitive/Types/UTxOSpec.hs → ...ardano/Wallet/Primitive/Types/UTxOSpec.hs
diff --git a/lib/primitive/test/Data/QuantitySpec.hs → lib/primitive/test/spec/Data/QuantitySpec.hs b/lib/primitive/test/Data/QuantitySpec.hs → lib/primitive/test/spec/Data/QuantitySpec.hs
diff --git a/lib/primitive/test/Spec.hs → lib/primitive/test/spec/Spec.hs b/lib/primitive/test/Spec.hs → lib/primitive/test/spec/Spec.hs
diff --git a/lib/primitive/test/run-test-suite.hs → lib/primitive/test/spec/run-test-suite.hs b/lib/primitive/test/run-test-suite.hs → lib/primitive/test/spec/run-test-suite.hs