Skip to content

Commit 6194bca

Browse files
Jimbo4350Jimbo4350
committed
Remove all Data.Map usage within bench folder
1 parent 1feaa0e commit 6194bca

File tree

10 files changed

+56
-58
lines changed

10 files changed

+56
-58
lines changed

‎bench/locli/src/Cardano/Unlog/LogObject.hs

+22-22
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@
1010

1111
module Cardano.Unlog.LogObject (module Cardano.Unlog.LogObject) where
1212

13-
import Prelude (head, id, show, unzip3)
14-
import Cardano.Prelude hiding (Text, head, show)
15-
16-
import Control.Monad (fail)
17-
import Data.Aeson qualified as AE
18-
import Data.Aeson.KeyMap qualified as KeyMap
19-
import Data.Aeson.Types (Parser)
20-
import Data.Aeson.Key qualified as Aeson
21-
import Data.ByteString.Lazy qualified as LBS
22-
import Data.Text qualified as LText
23-
import Data.Text.Short qualified as Text
24-
import Data.Text.Short (ShortText, fromText, toText)
25-
import Data.Map qualified as Map
26-
import Data.Vector (Vector)
27-
import Data.Vector qualified as V
28-
29-
import Cardano.Logging.Resources.Types
30-
31-
import Cardano.Analysis.API.Ground
32-
import Cardano.Util
33-
34-
import Data.Accum (zeroUTCTime)
13+
import Cardano.Prelude hiding (Text, head, show)
14+
import Prelude (head, id, show, unzip3)
15+
16+
import Control.Monad (fail)
17+
import qualified Data.Aeson as AE
18+
import qualified Data.Aeson.Key as Aeson
19+
import qualified Data.Aeson.KeyMap as KeyMap
20+
import Data.Aeson.Types (Parser)
21+
import qualified Data.ByteString.Lazy as LBS
22+
import qualified Data.Map.Strict as Map
23+
import qualified Data.Text as LText
24+
import Data.Text.Short (ShortText, fromText, toText)
25+
import qualified Data.Text.Short as Text
26+
import Data.Vector (Vector)
27+
import qualified Data.Vector as V
28+
29+
import Cardano.Logging.Resources.Types
30+
31+
import Cardano.Analysis.API.Ground
32+
import Cardano.Util
33+
34+
import Data.Accum (zeroUTCTime)
3535

3636

3737
type Text = ShortText

‎bench/trace-analyzer/src/Cardano/Tracer/Analyze/Process.hs

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ module Cardano.Tracer.Analyze.Process
55
, extractNamespace
66
) where
77

8-
import Cardano.Tracer.Analyze.Types (FileDBM (..), LineNumber)
8+
import Cardano.Tracer.Analyze.Types (FileDBM (..), LineNumber)
99

10-
import qualified Data.Aeson as AE
11-
import qualified Data.Aeson.KeyMap as AE
10+
import qualified Data.Aeson as AE
11+
import qualified Data.Aeson.KeyMap as AE
1212
import qualified Data.Attoparsec.ByteString.Char8 as Atto
13-
import qualified Data.ByteString.Char8 as BS
14-
import Data.Either (partitionEithers)
15-
import Data.Foldable (foldl')
16-
import qualified Data.Map as Map
17-
import qualified Data.Text as Txt
18-
import qualified Data.Vector as V
13+
import qualified Data.ByteString.Char8 as BS
14+
import Data.Either (partitionEithers)
15+
import Data.Foldable (foldl')
16+
import qualified Data.Map.Strict as Map
17+
import qualified Data.Text as Txt
18+
import qualified Data.Vector as V
1919

2020
parseAndPreprocess :: FilePath -> IO FileDBM
2121
parseAndPreprocess fp = do

‎bench/trace-analyzer/src/Cardano/Tracer/Analyze/Report.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Control.Monad (when)
88
import qualified Data.Aeson as AE
99
import Data.ByteString.Lazy (toStrict)
1010
import Data.List (nub, (\\))
11-
import qualified Data.Map as Map
11+
import qualified Data.Map.Strict as Map
1212
import Data.Text (Text, drop, isPrefixOf, unpack)
1313
import Data.Text.Encoding (decodeUtf8)
1414

‎bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Codec.Serialise (DeserialiseFailure)
1717
import Control.Concurrent.Class.MonadSTM.Strict (newTVarIO)
1818
import Control.Monad.Class.MonadTimer (MonadTimer, threadDelay)
1919
import Data.ByteString.Lazy (ByteString)
20-
import qualified Data.Map as Map
20+
import qualified Data.Map.Strict as Map
2121
import Data.Proxy (Proxy (..))
2222
import Network.Socket (AddrInfo (..))
2323
import System.Random (newStdGen)

‎bench/tx-generator/src/Cardano/Benchmarking/PlutusExample.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{-# LANGUAGE ScopedTypeVariables #-}
44
module Cardano.Benchmarking.PlutusExample
55
where
6-
import qualified Data.Map as Map
6+
import qualified Data.Map.Strict as Map
77
import Prelude
88

99
import Control.Monad.Trans.Except

‎bench/tx-generator/src/Cardano/Benchmarking/Script/Env.hs

+11-12
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,27 @@ module Cardano.Benchmarking.Script.Env (
4040
, setEnvWallets
4141
) where
4242

43-
import Prelude
44-
import qualified Data.Text as Text
45-
import Data.Map (Map)
46-
import qualified Data.Map as Map
4743
import Control.Monad.IO.Class
4844
import Control.Monad.Trans.Class
4945
import Control.Monad.Trans.Except
5046
import Control.Monad.Trans.RWS.Strict (RWST)
5147
import qualified Control.Monad.Trans.RWS.Strict as RWS
5248
import "contra-tracer" Control.Tracer (traceWith)
49+
import Data.Map.Strict (Map)
50+
import qualified Data.Map.Strict as Map
51+
import qualified Data.Text as Text
52+
import Prelude
5353

54-
import qualified Cardano.Benchmarking.LogTypes as Tracer
55-
import Ouroboros.Network.NodeToClient (IOManager)
56-
import Cardano.Node.Protocol.Types (SomeConsensusProtocol)
5754
import Cardano.Benchmarking.GeneratorTx
58-
import Cardano.Benchmarking.Wallet
59-
import Cardano.Benchmarking.OuroborosImports(NetworkId,
60-
PaymentKey, ShelleyGenesis, SigningKey,
61-
StandardShelley)
55+
import qualified Cardano.Benchmarking.LogTypes as Tracer
56+
import Cardano.Benchmarking.OuroborosImports (NetworkId, PaymentKey, ShelleyGenesis,
57+
SigningKey, StandardShelley)
6258
import Cardano.Benchmarking.Script.Types
59+
import Cardano.Benchmarking.Wallet
60+
import Cardano.Node.Protocol.Types (SomeConsensusProtocol)
61+
import Ouroboros.Network.NodeToClient (IOManager)
6362

64-
import Cardano.TxGenerator.Types (TxGenError(..))
63+
import Cardano.TxGenerator.Types (TxGenError (..))
6564

6665
data Env = Env { protoParams :: Maybe ProtocolParameterMode
6766
, benchTracers :: Maybe Tracer.BenchTracers

‎bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ import GHC.Generics
3232
import Data.Aeson as A
3333
import qualified Data.Aeson.KeyMap as KeyMap
3434
import Data.Kind
35-
import qualified Data.Map as Map
35+
import qualified Data.Map.Strict as Map
3636

3737
import Data.Proxy
3838
import Data.Text (Text)
3939
import qualified Data.Text as Text
4040
import Data.Time.Clock
4141

42+
import Ouroboros.Network.IOManager (IOManager)
4243
import Trace.Forward.Utils.DataPoint
4344
import Trace.Forward.Utils.TraceObject
44-
import Ouroboros.Network.IOManager (IOManager)
4545

4646
import Cardano.Api
4747
import Cardano.Logging

‎bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module Cardano.TxGenerator.Setup.Plutus
1010
)
1111
where
1212

13-
import qualified Data.Map as Map
13+
import qualified Data.Map.Strict as Map
1414

1515
import Control.Monad.Trans.Except
1616
import Control.Monad.Trans.Except.Extra

‎cardano-node/src/Cardano/Tracing/Tracers.hs

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import Codec.CBOR.Read (DeserialiseFailure)
3636
import Data.Aeson (ToJSON (..), Value (..))
3737
import Data.IntPSQ (IntPSQ)
3838
import qualified Data.IntPSQ as Pq
39-
import qualified Data.Map.Strict as SMap
39+
import qualified Data.Map.Strict as Map
4040
import qualified Data.Text as Text
4141
import Data.Time (NominalDiffTime, UTCTime)
4242
import qualified System.Metrics.Counter as Counter
@@ -580,38 +580,38 @@ traceI tr meta msg i = traceNamedObject tr (meta, LogValue msg (PureI (fromInteg
580580
sendEKGDirectCounter :: EKGDirect -> Text -> IO ()
581581
sendEKGDirectCounter ekgDirect name = do
582582
modifyMVar_ (ekgCounters ekgDirect) $ \registeredMap -> do
583-
case SMap.lookup name registeredMap of
583+
case Map.lookup name registeredMap of
584584
Just counter -> do
585585
Counter.inc counter
586586
pure registeredMap
587587
Nothing -> do
588588
counter <- EKG.getCounter name (ekgServer ekgDirect)
589589
Counter.inc counter
590-
pure $ SMap.insert name counter registeredMap
590+
pure $ Map.insert name counter registeredMap
591591

592592
sendEKGDirectInt :: Integral a => EKGDirect -> Text -> a -> IO ()
593593
sendEKGDirectInt ekgDirect name val = do
594594
modifyMVar_ (ekgGauges ekgDirect) $ \registeredMap -> do
595-
case SMap.lookup name registeredMap of
595+
case Map.lookup name registeredMap of
596596
Just gauge -> do
597597
Gauge.set gauge (fromIntegral val)
598598
pure registeredMap
599599
Nothing -> do
600600
gauge <- EKG.getGauge name (ekgServer ekgDirect)
601601
Gauge.set gauge (fromIntegral val)
602-
pure $ SMap.insert name gauge registeredMap
602+
pure $ Map.insert name gauge registeredMap
603603

604604
sendEKGDirectDouble :: EKGDirect -> Text -> Double -> IO ()
605605
sendEKGDirectDouble ekgDirect name val = do
606606
modifyMVar_ (ekgLabels ekgDirect) $ \registeredMap -> do
607-
case SMap.lookup name registeredMap of
607+
case Map.lookup name registeredMap of
608608
Just label -> do
609609
Label.set label (Text.pack (show val))
610610
pure registeredMap
611611
Nothing -> do
612612
label <- EKG.getLabel name (ekgServer ekgDirect)
613613
Label.set label (Text.pack (show val))
614-
pure $ SMap.insert name label registeredMap
614+
pure $ Map.insert name label registeredMap
615615

616616
--------------------------------------------------------------------------------
617617
-- Consensus Tracers

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ import qualified Data.HashMap.Strict as HM
5454
import Data.IORef
5555
import Data.Map.Strict (Map)
5656
import qualified Data.Map.Strict as Map
57-
import qualified Data.Map.Strict as SMap
5857

5958
import Data.Text (Text, pack, unpack)
6059
import Data.Text.Lazy (toStrict)
@@ -390,7 +389,7 @@ newtype DocCollector = DocCollector (IORef (Map Int LogDoc))
390389

391390
data LogDoc = LogDoc {
392391
ldDoc :: !Text
393-
, ldMetricsDoc :: !(SMap.Map Text Text)
392+
, ldMetricsDoc :: !(Map.Map Text Text)
394393
, ldNamespace :: ![Namespace]
395394
, ldSeverity :: ![SeverityS]
396395
, ldPrivacy :: ![Privacy]

0 commit comments

Comments
 (0)