Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit 73d8de6

Browse files
author
Michael Hueschen
committed
[CDEC-451] Remove Mockable; update test packages
1 parent d6e5c5f commit 73d8de6

File tree

19 files changed

+3
-1196
lines changed

19 files changed

+3
-1196
lines changed

core/cardano-sl-core.cabal

-15
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,6 @@ library
6060
-- Concurrency operations, previously
6161
-- in `Mockable`.
6262
Pos.Core.Conc
63-
-- Mockable (moved from networking in
64-
-- the `sinbin` shuffle). All modules
65-
-- must be exposed so that `networking`
66-
-- can import & re-export them.
67-
Pos.Core.Mockable
68-
Pos.Core.Mockable.Channel
69-
Pos.Core.Mockable.Class
70-
Pos.Core.Mockable.Concurrent
71-
Pos.Core.Mockable.CurrentTime
72-
Pos.Core.Mockable.Instances
73-
Pos.Core.Mockable.Monad
74-
Pos.Core.Mockable.Production
75-
Pos.Core.Mockable.SharedAtomic
76-
Pos.Core.Mockable.SharedExclusive
77-
Pos.Core.Mockable.Metrics
7863

7964
Pos.Core.Reporting
8065

core/src/Pos/Core/JsonLog/JsonLogT.hs

-32
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ import System.Wlog (CanLog, HasLoggerName (..), WithLogger,
4848

4949
import Pos.Core.JsonLog.CanJsonLog (CanJsonLog (..))
5050
import Pos.Core.JsonLog.Event (JLTimedEvent, timedIO, toEvent)
51-
import Pos.Core.Mockable.Channel (ChannelT)
52-
import Pos.Core.Mockable.Concurrent (Promise, ThreadId)
53-
import Pos.Core.Mockable.Metrics (Counter, Distribution, Gauge)
54-
import Pos.Core.Mockable.SharedAtomic (SharedAtomicT)
55-
import Pos.Core.Mockable.SharedExclusive (SharedExclusiveT)
5651

5752
data JsonLogConfig
5853
= JsonLogDisabled
@@ -84,33 +79,6 @@ instance WithLogger m => HasLoggerName (JsonLogT m) where
8479

8580

8681

87-
type instance Gauge (JsonLogT m) = Gauge m
88-
type instance Counter (JsonLogT m) = Counter m
89-
type instance Distribution (JsonLogT m) = Distribution m
90-
type instance ThreadId (JsonLogT m) = ThreadId m
91-
type instance Promise (JsonLogT m) = Promise m
92-
type instance SharedAtomicT (JsonLogT m) = SharedAtomicT m
93-
type instance SharedExclusiveT (JsonLogT m) = SharedExclusiveT m
94-
type instance ChannelT (JsonLogT m) = ChannelT m
95-
96-
97-
98-
99-
100-
101-
102-
103-
104-
105-
106-
107-
108-
109-
110-
111-
112-
113-
11482

11583
jsonLogDefault
11684
:: (ToJSON a, MonadCatch m, MonadIO m, WithLogger m)

core/src/Pos/Core/Mockable.hs

-14
This file was deleted.

core/src/Pos/Core/Mockable/Channel.hs

-58
This file was deleted.

core/src/Pos/Core/Mockable/Class.hs

-37
This file was deleted.

0 commit comments

Comments
 (0)