From 73745b0aabd021e8da58bf7498679acc65746446 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Mon, 28 Nov 2022 15:40:49 -0400 Subject: [PATCH] Remove all Data.Map usage within bench folder --- bench/locli/src/Cardano/Unlog/LogObject.hs | 44 +++++++++---------- .../src/Cardano/Tracer/Analyze/Process.hs | 18 ++++---- .../src/Cardano/Tracer/Analyze/Report.hs | 2 +- .../Benchmarking/GeneratorTx/NodeToNode.hs | 19 ++++---- .../src/Cardano/Benchmarking/PlutusExample.hs | 2 +- .../src/Cardano/Benchmarking/Script/Env.hs | 23 +++++----- .../src/Cardano/Benchmarking/Tracer.hs | 4 +- .../src/Cardano/TxGenerator/Setup/Plutus.hs | 2 +- 8 files changed, 56 insertions(+), 58 deletions(-) diff --git a/bench/locli/src/Cardano/Unlog/LogObject.hs b/bench/locli/src/Cardano/Unlog/LogObject.hs index 46f116fe805..475fd23d114 100644 --- a/bench/locli/src/Cardano/Unlog/LogObject.hs +++ b/bench/locli/src/Cardano/Unlog/LogObject.hs @@ -10,28 +10,28 @@ module Cardano.Unlog.LogObject (module Cardano.Unlog.LogObject) where -import Prelude (head, id, show, unzip3) -import Cardano.Prelude hiding (Text, head, show) - -import Control.Monad (fail) -import Data.Aeson qualified as AE -import Data.Aeson.KeyMap qualified as KeyMap -import Data.Aeson.Types (Parser) -import Data.Aeson.Key qualified as Aeson -import Data.ByteString.Lazy qualified as LBS -import Data.Text qualified as LText -import Data.Text.Short qualified as Text -import Data.Text.Short (ShortText, fromText, toText) -import Data.Map qualified as Map -import Data.Vector (Vector) -import Data.Vector qualified as V - -import Cardano.Logging.Resources.Types - -import Cardano.Analysis.API.Ground -import Cardano.Util - -import Data.Accum (zeroUTCTime) +import Cardano.Prelude hiding (Text, head, show) +import Prelude (head, id, show, unzip3) + +import Control.Monad (fail) +import qualified Data.Aeson as AE +import qualified Data.Aeson.Key as Aeson +import qualified Data.Aeson.KeyMap as KeyMap +import Data.Aeson.Types (Parser) +import qualified Data.ByteString.Lazy as LBS +import qualified Data.Map.Strict as Map +import qualified Data.Text as LText +import Data.Text.Short (ShortText, fromText, toText) +import qualified Data.Text.Short as Text +import Data.Vector (Vector) +import qualified Data.Vector as V + +import Cardano.Logging.Resources.Types + +import Cardano.Analysis.API.Ground +import Cardano.Util + +import Data.Accum (zeroUTCTime) type Text = ShortText diff --git a/bench/trace-analyzer/src/Cardano/Tracer/Analyze/Process.hs b/bench/trace-analyzer/src/Cardano/Tracer/Analyze/Process.hs index da17fd5923c..a9c4a10ca4a 100644 --- a/bench/trace-analyzer/src/Cardano/Tracer/Analyze/Process.hs +++ b/bench/trace-analyzer/src/Cardano/Tracer/Analyze/Process.hs @@ -5,17 +5,17 @@ module Cardano.Tracer.Analyze.Process , extractNamespace ) where -import Cardano.Tracer.Analyze.Types (FileDBM (..), LineNumber) +import Cardano.Tracer.Analyze.Types (FileDBM (..), LineNumber) -import qualified Data.Aeson as AE -import qualified Data.Aeson.KeyMap as AE +import qualified Data.Aeson as AE +import qualified Data.Aeson.KeyMap as AE import qualified Data.Attoparsec.ByteString.Char8 as Atto -import qualified Data.ByteString.Char8 as BS -import Data.Either (partitionEithers) -import Data.Foldable (foldl') -import qualified Data.Map as Map -import qualified Data.Text as Txt -import qualified Data.Vector as V +import qualified Data.ByteString.Char8 as BS +import Data.Either (partitionEithers) +import Data.Foldable (foldl') +import qualified Data.Map.Strict as Map +import qualified Data.Text as Txt +import qualified Data.Vector as V parseAndPreprocess :: FilePath -> IO FileDBM parseAndPreprocess fp = do diff --git a/bench/trace-analyzer/src/Cardano/Tracer/Analyze/Report.hs b/bench/trace-analyzer/src/Cardano/Tracer/Analyze/Report.hs index c885c361714..ab3ef5228c3 100644 --- a/bench/trace-analyzer/src/Cardano/Tracer/Analyze/Report.hs +++ b/bench/trace-analyzer/src/Cardano/Tracer/Analyze/Report.hs @@ -8,7 +8,7 @@ import Control.Monad (when) import qualified Data.Aeson as AE import Data.ByteString.Lazy (toStrict) import Data.List (nub, (\\)) -import qualified Data.Map as Map +import qualified Data.Map.Strict as Map import Data.Text (Text, drop, isPrefixOf, unpack) import Data.Text.Encoding (decodeUtf8) diff --git a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs index 98097069124..4075dff51c3 100644 --- a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs +++ b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs @@ -14,17 +14,17 @@ import Cardano.Prelude (forever, liftIO) import Prelude import Codec.Serialise (DeserialiseFailure) -import Control.Monad.Class.MonadTimer (MonadTimer, threadDelay) import Control.Monad.Class.MonadSTM.Strict (newTVarIO) +import Control.Monad.Class.MonadTimer (MonadTimer, threadDelay) import Data.ByteString.Lazy (ByteString) -import qualified Data.Map as Map +import qualified Data.Map.Strict as Map import Data.Proxy (Proxy (..)) import Network.Socket (AddrInfo (..)) import System.Random (newStdGen) import "contra-tracer" Control.Tracer (Tracer, nullTracer) -import Ouroboros.Consensus.Byron.Ledger.Mempool (GenTx) import Ouroboros.Consensus.Block.Abstract +import Ouroboros.Consensus.Byron.Ledger.Mempool (GenTx) import qualified Ouroboros.Consensus.Cardano as Consensus (CardanoBlock) import Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId) import Ouroboros.Consensus.Network.NodeToNode (Codecs (..), defaultCodecs) @@ -37,19 +37,18 @@ import Ouroboros.Network.DeltaQ (defaultGSV) import Ouroboros.Network.Driver (runPeerWithLimits) import Ouroboros.Network.KeepAlive import Ouroboros.Network.Magic -import Ouroboros.Network.Mux (MuxPeer (..), OuroborosApplication (..), - OuroborosBundle, RunMiniProtocol (..), - continueForever) -import Ouroboros.Network.NodeToClient (chainSyncPeerNull, IOManager) +import Ouroboros.Network.Mux (MuxPeer (..), OuroborosApplication (..), OuroborosBundle, + RunMiniProtocol (..), continueForever) +import Ouroboros.Network.NodeToClient (IOManager, chainSyncPeerNull) import Ouroboros.Network.NodeToNode (NetworkConnectTracers (..)) import qualified Ouroboros.Network.NodeToNode as NtN import Ouroboros.Network.Protocol.BlockFetch.Client (BlockFetchClient (..), - blockFetchClientPeer) + blockFetchClientPeer) import Ouroboros.Network.Protocol.Handshake.Version (simpleSingletonVersions) -import Ouroboros.Network.Protocol.KeepAlive.Codec import Ouroboros.Network.Protocol.KeepAlive.Client +import Ouroboros.Network.Protocol.KeepAlive.Codec import Ouroboros.Network.Protocol.TxSubmission2.Client (TxSubmissionClient, - txSubmissionClientPeer) + txSubmissionClientPeer) import Ouroboros.Network.Snocket (socketSnocket) diff --git a/bench/tx-generator/src/Cardano/Benchmarking/PlutusExample.hs b/bench/tx-generator/src/Cardano/Benchmarking/PlutusExample.hs index ed294c11223..8b178347284 100644 --- a/bench/tx-generator/src/Cardano/Benchmarking/PlutusExample.hs +++ b/bench/tx-generator/src/Cardano/Benchmarking/PlutusExample.hs @@ -3,7 +3,7 @@ {-# LANGUAGE ScopedTypeVariables #-} module Cardano.Benchmarking.PlutusExample where -import qualified Data.Map as Map +import qualified Data.Map.Strict as Map import Prelude import Control.Monad.Trans.Except diff --git a/bench/tx-generator/src/Cardano/Benchmarking/Script/Env.hs b/bench/tx-generator/src/Cardano/Benchmarking/Script/Env.hs index 86885f9fe65..1c817e51619 100644 --- a/bench/tx-generator/src/Cardano/Benchmarking/Script/Env.hs +++ b/bench/tx-generator/src/Cardano/Benchmarking/Script/Env.hs @@ -40,28 +40,27 @@ module Cardano.Benchmarking.Script.Env ( , setEnvWallets ) where -import Prelude -import qualified Data.Text as Text -import Data.Map (Map) -import qualified Data.Map as Map import Control.Monad.IO.Class import Control.Monad.Trans.Class import Control.Monad.Trans.Except import Control.Monad.Trans.RWS.Strict (RWST) import qualified Control.Monad.Trans.RWS.Strict as RWS import "contra-tracer" Control.Tracer (traceWith) +import Data.Map.Strict (Map) +import qualified Data.Map.Strict as Map +import qualified Data.Text as Text +import Prelude -import qualified Cardano.Benchmarking.LogTypes as Tracer -import Ouroboros.Network.NodeToClient (IOManager) -import Cardano.Node.Protocol.Types (SomeConsensusProtocol) import Cardano.Benchmarking.GeneratorTx -import Cardano.Benchmarking.Wallet -import Cardano.Benchmarking.OuroborosImports(NetworkId, - PaymentKey, ShelleyGenesis, SigningKey, - StandardShelley) +import qualified Cardano.Benchmarking.LogTypes as Tracer +import Cardano.Benchmarking.OuroborosImports (NetworkId, PaymentKey, ShelleyGenesis, + SigningKey, StandardShelley) import Cardano.Benchmarking.Script.Types +import Cardano.Benchmarking.Wallet +import Cardano.Node.Protocol.Types (SomeConsensusProtocol) +import Ouroboros.Network.NodeToClient (IOManager) -import Cardano.TxGenerator.Types (TxGenError(..)) +import Cardano.TxGenerator.Types (TxGenError (..)) data Env = Env { protoParams :: Maybe ProtocolParameterMode , benchTracers :: Maybe Tracer.BenchTracers diff --git a/bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs b/bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs index 828ea0e9945..ea4f40e3a68 100644 --- a/bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs +++ b/bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs @@ -32,16 +32,16 @@ import GHC.Generics import Data.Aeson as A import qualified Data.Aeson.KeyMap as KeyMap import Data.Kind -import qualified Data.Map as Map +import qualified Data.Map.Strict as Map import Data.Proxy import Data.Text (Text) import qualified Data.Text as Text import Data.Time.Clock +import Ouroboros.Network.IOManager (IOManager) import Trace.Forward.Utils.DataPoint import Trace.Forward.Utils.TraceObject -import Ouroboros.Network.IOManager (IOManager) import Cardano.Api import Cardano.Logging diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs b/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs index 18ab30e7be7..23797741b85 100644 --- a/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs +++ b/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs @@ -10,7 +10,7 @@ module Cardano.TxGenerator.Setup.Plutus ) where -import qualified Data.Map as Map +import qualified Data.Map.Strict as Map import Control.Monad.Trans.Except import Control.Monad.Trans.Except.Extra