Skip to content

Commit ec8b027

Browse files
IcelandjackIcelandjack
committed
Fixed trailing whitespace.
1 parent c312d01 commit ec8b027

File tree

6 files changed

+25
-26
lines changed

6 files changed

+25
-26
lines changed

‎cardano-node/src/Cardano/Node/Startup.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,14 @@ data StartupTrace blk =
136136
| LedgerPeerSnapshotLoaded (WithOrigin SlotNo)
137137
| MovedTopLevelOption String
138138

139-
data EnabledBlockForging
139+
data EnabledBlockForging
140140
= EnabledBlockForging
141141
| DisabledBlockForging
142142
| NotEffective
143143
-- ^ one needs to send `SIGHUP` after consensus
144144
-- initialised itself (especially after replying all
145145
-- blocks).
146-
deriving stock
146+
deriving stock
147147
(Eq, Show)
148148

149149
data BasicInfoCommon = BasicInfoCommon {

‎cardano-tracer/cardano-tracer.cabal

+10-11
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,9 @@ library
193193
, string-qq
194194
, text
195195
, time
196-
, trace-dispatcher ^>= 2.8.1
196+
, trace-dispatcher ^>= 2.9
197197
, trace-forward ^>= 2.2.10
198198
, trace-resources ^>= 0.2.3
199-
, unordered-containers
200199
, wai ^>= 3.2
201200
, warp ^>= 3.4
202201
, yaml
@@ -251,11 +250,11 @@ library demo-forwarder-lib
251250
, generic-data
252251
, network-mux
253252
, optparse-applicative-fork >= 0.18.1
254-
, ouroboros-network-api ^>= 0.12
253+
, ouroboros-network-api ^>= 0.13
255254
, ouroboros-network-framework
256255
, tasty-quickcheck
257256
, time
258-
, trace-dispatcher ^>= 2.8.1
257+
, trace-dispatcher ^>= 2.9
259258
, trace-forward ^>= 2.2.10
260259
, vector
261260
, vector-algorithms
@@ -294,7 +293,7 @@ library demo-acceptor-lib
294293
, filepath
295294
, generic-data
296295
, optparse-applicative-fork >= 0.18.1
297-
, ouroboros-network-api ^>= 0.12
296+
, ouroboros-network-api ^>= 0.13
298297
, stm <2.5.2 || >=2.5.3
299298
, text
300299
, tasty-quickcheck
@@ -353,14 +352,14 @@ test-suite cardano-tracer-test
353352
, generic-data
354353
, network-mux
355354
, optparse-applicative-fork >= 0.18.1
356-
, ouroboros-network-api ^>= 0.12
355+
, ouroboros-network-api ^>= 0.13
357356
, ouroboros-network-framework
358357
, stm <2.5.2 || >=2.5.3
359358
, tasty
360359
, tasty-quickcheck
361360
, text
362361
, time
363-
, trace-dispatcher ^>= 2.8.1
362+
, trace-dispatcher ^>= 2.9
364363
, trace-forward ^>= 2.2.10
365364
, unix-compat
366365
, vector
@@ -412,16 +411,16 @@ test-suite cardano-tracer-test-ext
412411
, Glob
413412
, network-mux
414413
, optparse-applicative-fork >= 0.18.1
415-
, ouroboros-network ^>= 0.19.0.3
416-
, ouroboros-network-api ^>= 0.12
414+
, ouroboros-network ^>= 0.20
415+
, ouroboros-network-api ^>= 0.13
417416
, ouroboros-network-framework
418417
, process
419418
, QuickCheck
420419
, tasty
421420
, tasty-quickcheck
422421
, text
423422
, time
424-
, trace-dispatcher ^>= 2.8.1
423+
, trace-dispatcher ^>= 2.9
425424
, trace-forward ^>= 2.2.10
426425
, unix-compat
427426
, vector
@@ -448,7 +447,7 @@ benchmark cardano-tracer-bench
448447
, extra
449448
, filepath
450449
, time
451-
, trace-dispatcher ^>= 2.8.1
450+
, trace-dispatcher ^>= 2.9
452451

453452
ghc-options: -threaded
454453
-rtsopts

‎cardano-tracer/src/Cardano/Tracer/Configuration.hs

+5-5
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ data RotationParams = RotationParams
7272
deriving stock (Eq, Generic, Show)
7373
deriving anyclass ToJSON
7474

75-
-- | Some fields are defaulted:
76-
--
77-
-- `rpFrequencySecs` defaults to 1 minute.
78-
--
75+
-- | Some fields are defaulted:
76+
--
77+
-- `rpFrequencySecs` defaults to 1 minute.
78+
--
7979
-- Max age for `RotationParams` can be specified in `rpMaxAgeMinutes`
8080
-- or `rpMaxAgeHours`: otherwise defaulting to 24 hours.
8181
instance FromJSON RotationParams where
@@ -84,7 +84,7 @@ instance FromJSON RotationParams where
8484
<|> pure 60
8585
rpLogLimitBytes <- o .: "rpLogLimitBytes"
8686
rpMaxAgeMinutes <- o .: "rpMaxAgeMinutes"
87-
<|> o .: "rpMaxAgeHours" <&> (* 60)
87+
<|> (o .: "rpMaxAgeHours" <&> (* 60))
8888
<|> pure (24 * 60)
8989
rpKeepFilesNum <- o .: "rpKeepFilesNum"
9090
pure RotationParams{..}

‎cardano-tracer/src/Cardano/Tracer/Handlers/Notifications/Timer.hs

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ checkPeriod :: PeriodInSec
3030
checkPeriod = 1
3131

3232
traceOnly :: Trace IO TracerTrace -> String -> IO ()
33-
traceOnly tracer =
33+
traceOnly tracer =
3434
traceWith tracer . TracerError . Text.pack
3535

3636
type Timer :: Type
@@ -48,7 +48,7 @@ mkTimer
4848
-> Bool
4949
-> PeriodInSec
5050
-> IO Timer
51-
mkTimer = mkTimerOnFailure (pure ())
51+
mkTimer = mkTimerOnFailure (pure ())
5252

5353
mkTimerStderr
5454
:: IO ()
@@ -89,7 +89,7 @@ mkTimerOnFailure onFailure tracer io state callPeriod_sec = do
8989
let tryIO :: IO () = try @SomeException io >>= \case
9090
Left exception -> do
9191
traceOnly tracer (displayException exception)
92-
onFailure
92+
onFailure
9393
_ -> reset
9494

9595
let run :: IO ()
@@ -110,4 +110,3 @@ mkTimerOnFailure onFailure tracer io state callPeriod_sec = do
110110
, startTimer = modifyIORef' isRunning (const True)
111111
, stopTimer = modifyIORef' isRunning (const False)
112112
}
113-

‎trace-dispatcher/src/Cardano/Logging/Types.hs

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{-# LANGUAGE DeriveGeneric #-}
33
{-# LANGUAGE DerivingStrategies #-}
44
{-# LANGUAGE GADTs #-}
5+
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
56
{-# LANGUAGE RankNTypes #-}
67
{-# LANGUAGE ScopedTypeVariables #-}
78
{-# LANGUAGE StandaloneDeriving #-}
@@ -252,7 +253,7 @@ data LoggingContext = LoggingContext {
252253
, lcPrivacy :: Maybe Privacy
253254
, lcDetails :: Maybe DetailLevel
254255
}
255-
deriving stock
256+
deriving stock
256257
(Show, Generic)
257258
deriving anyclass
258259
Serialise
@@ -377,7 +378,7 @@ data TraceObject = TraceObject {
377378
, toTimestamp :: !UTCTime
378379
, toHostname :: !Text
379380
, toThreadId :: !Text
380-
} deriving stock
381+
} deriving stock
381382
(Eq, Show, Generic)
382383
-- ^ Instances for 'TraceObject' to forward it using 'trace-forward' library.
383384
deriving anyclass

‎trace-dispatcher/src/Cardano/Logging/Types/NodeStartupInfo.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ data NodeStartupInfo = NodeStartupInfo
2323
, suiSlotLength :: NominalDiffTime
2424
, suiEpochLength :: Word64
2525
, suiSlotsPerKESPeriod :: Word64
26-
}
27-
deriving stock
26+
}
27+
deriving stock
2828
(Eq, Show, Generic)
2929
deriving anyclass
3030
(NFData, ToJSON, FromJSON)

0 commit comments

Comments
 (0)