Merge pull request #3504 from input-output-hk/mafo/develop-quick-fix

quickfix for a build-error introduced in 1622c6c

Author: disassembler

pkgs/default.nix

@@ -17785,6 +17785,7 @@ license = stdenv.lib.licenses.mit;
 , generics-sop
 , hedgehog
 , hspec
+, hspec-core
 , http-api-data
 , http-client
 , http-client-tls
@@ -18007,6 +18008,7 @@ filepath
 formatting
 hedgehog
 hspec
+hspec-core
 lens
 mtl
 normaldistribution

wallet-new/cardano-sl-wallet-new.cabal

@@ -511,6 +511,7 @@ test-suite wallet-unit-tests
                     , data-default
                     , formatting
                     , hspec
+                    , hspec-core
                     , lens
                     , mtl
                     , QuickCheck

wallet-new/src/Cardano/Wallet/API/WIP/LegacyHandlers.hs

@@ -9,11 +9,6 @@ module Cardano.Wallet.API.WIP.LegacyHandlers (
       handlers
     ) where
 
-import           Ntp.Client (NtpStatus)
-import           Pos.Chain.Txp (TxpConfiguration)
-import           Pos.Crypto (ProtocolMagic)
-import           Pos.Infra.Diffusion.Types (Diffusion)
-
 import           Formatting (build, sformat)
 import           Universum
 import           UnliftIO (MonadUnliftIO)
@@ -38,12 +33,8 @@ import           Servant
 
 handlers :: HasConfigurations
             => (forall a. MonadV1 a -> Handler a)
-            -> ProtocolMagic
-            -> TxpConfiguration
-            -> Diffusion MonadV1
-            -> TVar NtpStatus
             -> Server WIP.API
-handlers naturalTransformation _pm _txpConfig _diffusion _ntpStatus =
+handlers naturalTransformation =
          hoist' (Proxy @WIP.API) handlersPlain
   where
     hoist'

wallet-new/src/Cardano/Wallet/LegacyServer.hs

@@ -45,7 +45,7 @@ walletServer natV0 coreConfig txpConfig diffusion ntpStatus runMode =
     v0Handler       = V0.handlers natV0 coreConfig txpConfig diffusion ntpStatus
     v1Handler       = V1.handlers natV0 coreConfig txpConfig diffusion ntpStatus
     internalHandler = Internal.handlers natV0 runMode
-    wipHandler      = WIP.handlers natV0 pm txpConfig diffusion ntpStatus
+    wipHandler      = WIP.handlers natV0
 
 walletDocServer
     :: (HasConfigurations, HasCompileInfo)

wallet-new/test/unit/Test/Spec/Keystore.hs

@@ -11,6 +11,7 @@ import           System.IO.Error (IOError)
 
 import           Test.Hspec (Spec, describe, it, shouldBe, shouldReturn,
                      shouldSatisfy)
+import           Test.Hspec.Core.Spec (sequential)
 import           Test.Hspec.QuickCheck (prop)
 import           Test.QuickCheck (Gen, arbitrary)
 import           Test.QuickCheck.Monadic (forAllM, monadicIO, pick, run)
@@ -51,9 +52,10 @@ nukeKeystore :: FilePath -> IO ()
 nukeKeystore fp =
     removeFile fp `catch` (\(_ :: IOError) -> return ())
 
+-- These test perform file-IO and cannot run in parallel.
 spec :: Spec
 spec =
-    describe "Keystore to store UserSecret(s)" $ do
+    sequential $ describe "Keystore to store UserSecret(s)" $ do
         it "creating a brand new one works" $ do
             nukeKeystore "test_keystore.key"
             Keystore.bracketKeystore KeepKeystoreIfEmpty "test_keystore.key" $ \_ks ->