[CDEC-451] Remove Mockable; update test packages

input-output-hk · Jul 21, 2018 · eb060b6 · eb060b6
1 parent 058e793
commit eb060b6
Show file tree

Hide file tree

Showing 19 changed files with 3 additions and 1,196 deletions.
diff --git a/core/cardano-sl-core.cabal b/core/cardano-sl-core.cabal
@@ -60,21 +60,6 @@ library
                        -- Concurrency operations, previously
                        -- in `Mockable`.
                        Pos.Core.Conc
-                       -- Mockable (moved from networking in
-                       -- the `sinbin` shuffle). All modules
-                       -- must be exposed so that `networking`
-                       -- can import & re-export them.
-                       Pos.Core.Mockable
-                       Pos.Core.Mockable.Channel
-                       Pos.Core.Mockable.Class
-                       Pos.Core.Mockable.Concurrent
-                       Pos.Core.Mockable.CurrentTime
-                       Pos.Core.Mockable.Instances
-                       Pos.Core.Mockable.Monad
-                       Pos.Core.Mockable.Production
-                       Pos.Core.Mockable.SharedAtomic
-                       Pos.Core.Mockable.SharedExclusive
-                       Pos.Core.Mockable.Metrics
 
                        Pos.Core.Reporting
 

diff --git a/core/src/Pos/Core/JsonLog/JsonLogT.hs b/core/src/Pos/Core/JsonLog/JsonLogT.hs
@@ -48,11 +48,6 @@ import           System.Wlog (CanLog, HasLoggerName (..), WithLogger,
 
 import           Pos.Core.JsonLog.CanJsonLog (CanJsonLog (..))
 import           Pos.Core.JsonLog.Event (JLTimedEvent, timedIO, toEvent)
-import           Pos.Core.Mockable.Channel (ChannelT)
-import           Pos.Core.Mockable.Concurrent (Promise, ThreadId)
-import           Pos.Core.Mockable.Metrics (Counter, Distribution, Gauge)
-import           Pos.Core.Mockable.SharedAtomic (SharedAtomicT)
-import           Pos.Core.Mockable.SharedExclusive (SharedExclusiveT)
 
 data JsonLogConfig
     = JsonLogDisabled
@@ -84,33 +79,6 @@ instance WithLogger m => HasLoggerName (JsonLogT m) where
 
 
 
-type instance Gauge (JsonLogT m) = Gauge m
-type instance Counter (JsonLogT m) = Counter m
-type instance Distribution (JsonLogT m) = Distribution m
-type instance ThreadId (JsonLogT m) = ThreadId m
-type instance Promise (JsonLogT m) = Promise m
-type instance SharedAtomicT (JsonLogT m) = SharedAtomicT m
-type instance SharedExclusiveT (JsonLogT m) = SharedExclusiveT m
-type instance ChannelT (JsonLogT m) = ChannelT m
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 jsonLogDefault
     :: (ToJSON a, MonadCatch m, MonadIO m, WithLogger m)

diff --git a/core/src/Pos/Core/Mockable.hs b/core/src/Pos/Core/Mockable.hs
diff --git a/core/src/Pos/Core/Mockable/Channel.hs b/core/src/Pos/Core/Mockable/Channel.hs
diff --git a/core/src/Pos/Core/Mockable/Class.hs b/core/src/Pos/Core/Mockable/Class.hs