configuration cleanup & separate test-suite for crypto (#106)

ouroboros-network.cabal

@@ -140,40 +140,39 @@ library
                        TypeApplications,
                        TypeFamilies,
                        TypeInType
-  build-depends:       base         >=4.9 && <4.13,
-                       array,
-                       async        >= 2.2 && <2.3,
-                       base16-bytestring >= 0.1 && <0.2,
-                       bytestring   >=0.10 && <0.11,
-                       base16-bytestring       <0.2,
-                       cborg        >=0.2.1 && <0.3,
-                       clock        >=0.7 && <0.8,
-                       containers   >=0.6 && <0.7,
-                       cryptonite   >=0.25 && <0.26,
-                       directory    < 1.5,
-                       exceptions   < 0.11,
-                       fingertree   >=0.1 && <0.2,
-                       filepath     < 1.5.0.0,
-                       free         >=5.1 && <5.2,
-                       hashable     >=1.2 && <1.3,
-                       memory       >=0.14 && <0.15,
-                       mtl,
-                       network      >=2.6 && <2.8,
-                       pipes        >=4.3 && <4.4,
-                       process,
-                       psqueues     >=0.2 && <0.3,
-                       random       >=1.1 && <1.2,
-                       semigroups   >=0.18 && <0.19,
-                       serialise    >=0.2 && <0.3,
-                       stm          >=2.5 && <2.6,
-                       text         >=1.2 && <1.3,
-                       transformers >=0.5 && <0.6,
-                       typed-transitions >= 0.1 && < 1.0,
-                       unliftio     >=0.2.6.0 && <0.3,
-                       vector       >=0.12 && <0.13,
-                       void         >=0.7 && <0.8,
+  build-depends:       base              >=4.9 && <4.13,
+                       array             >=0.5 && <0.6,
+                       async             >=2.2 && <2.3,
+                       base16-bytestring >=0.1 && <0.2,
+                       bytestring        >=0.10 && <0.11,
+                       cborg             >=0.2.1 && <0.3,
+                       clock             >=0.7 && <0.8,
+                       containers        >=0.6 && <0.7,
+                       cryptonite        >=0.25 && <0.26,
+                       directory         >=1.3 && <1.4,
+                       exceptions        >=0.10 && <0.11,
+                       fingertree        >=0.1 && <0.2,
+                       filepath          >=1.4 && <1.5,
+                       free              >=5.1 && <5.2,
+                       hashable          >=1.2 && <1.3,
+                       memory            >=0.14 && <0.15,
+                       mtl               >=2.2 && <2.3,
+                       network,
+                       pipes             >=4.3 && <4.4,
+                       process           >=1.6 && <1.7,
+                       psqueues          >=0.2 && <0.3,
+                       random            >=1.1 && <1.2,
+                       semigroups        >=0.18 && <0.19,
+                       serialise         >=0.2 && <0.3,
+                       stm               >=2.5 && <2.6,
+                       text              >=1.2 && <1.3,
+                       transformers      >=0.5 && <0.6,
+                       typed-transitions >=0.1 && < 1.0,
+                       unliftio          >=0.2.6.0 && <0.3,
+                       vector            >=0.12 && <0.13,
+                       void              >=0.7 && <0.8,
 
-                       QuickCheck   >=2.12 && <2.13
+                       QuickCheck        >=2.12 && <2.13
   if os(windows)
      Build-depends:       Win32
   else
@@ -261,10 +260,6 @@ test-suite test-consensus
   default-language: Haskell2010
   main-is:          Main.hs
   other-modules:
-                    Test.Crypto.DSIGN
-                    Test.Crypto.Hash
-                    Test.Crypto.KES
-                    Test.Crypto.VRF
                     Test.Dynamic.BFT
                     Test.Dynamic.General
                     Test.Dynamic.Praos
@@ -273,18 +268,35 @@ test-suite test-consensus
                     ouroboros-network,
 
                     QuickCheck,
-                    bytestring,
                     containers,
                     cryptonite,
                     mtl,
-                    typed-transitions,
                     tasty,
-                    tasty-expected-failure,
                     tasty-quickcheck,
                     typed-transitions
   ghc-options:      -Wall
                     -fno-ignore-asserts
 
+test-suite test-crypto
+  type:             exitcode-stdio-1.0
+  hs-source-dirs:   test-crypto
+  default-language: Haskell2010
+  main-is:          Main.hs
+  other-modules:
+                    Test.Crypto.DSIGN
+                    Test.Crypto.Hash
+                    Test.Crypto.KES
+                    Test.Crypto.VRF
+  build-depends:    base,
+                    ouroboros-network,
+
+                    QuickCheck,
+                    bytestring,
+                    tasty,
+                    tasty-quickcheck
+  ghc-options:      -Wall
+                    -fno-ignore-asserts
+
 test-suite test-storage
   type:             exitcode-stdio-1.0
   hs-source-dirs:   test-storage

stack.yaml

@@ -3,11 +3,11 @@ packages:
 - .
 flags: {}
 extra-package-dbs: []
-allow-newer: true
+allow-newer: false
 nix:
     enable: false
-    shell-file: shell.nix.lars
 extra-deps:
+- typed-transitions/
 - cborg-0.2.1.0
 - serialise-0.2.1.0
 - QuickCheck-2.12.6.1

test-consensus/Main.hs

@@ -2,10 +2,6 @@ module Main (main) where
 
 import           Test.Tasty
 
-import qualified Test.Crypto.DSIGN (tests)
-import qualified Test.Crypto.Hash (tests)
-import qualified Test.Crypto.KES (tests)
-import qualified Test.Crypto.VRF (tests)
 import qualified Test.Dynamic.BFT (tests)
 import qualified Test.Dynamic.Praos (tests)
 
@@ -15,10 +11,6 @@ main = defaultMain tests
 tests :: TestTree
 tests =
   testGroup "ouroboros-consensus"
-  [ Test.Crypto.DSIGN.tests
-  , Test.Crypto.Hash.tests
-  , Test.Crypto.KES.tests
-  , Test.Crypto.VRF.tests
-  , Test.Dynamic.BFT.tests
+  [ Test.Dynamic.BFT.tests
   , Test.Dynamic.Praos.tests
   ]

test-crypto/Main.hs

@@ -0,0 +1,20 @@
+module Main (main) where
+
+import           Test.Tasty
+
+import qualified Test.Crypto.DSIGN (tests)
+import qualified Test.Crypto.Hash (tests)
+import qualified Test.Crypto.KES (tests)
+import qualified Test.Crypto.VRF (tests)
+
+main :: IO ()
+main = defaultMain tests
+
+tests :: TestTree
+tests =
+  testGroup "ouroboros-consensus"
+  [ Test.Crypto.DSIGN.tests
+  , Test.Crypto.Hash.tests
+  , Test.Crypto.KES.tests
+  , Test.Crypto.VRF.tests
+  ]