From 7f9754b8c03121b1e0d99534e829e55004dac937 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 28 Aug 2024 15:41:13 -0400 Subject: [PATCH] Stylish haskell fixes --- .../Ouroboros/Consensus/Cardano/Node.hs | 4 ++-- ouroboros-consensus/bench/mempool-bench/Main.hs | 2 +- .../src/ouroboros-consensus/Ouroboros/Consensus/Mempool.hs | 4 ++-- .../ouroboros-consensus/Ouroboros/Consensus/Mempool/API.hs | 2 +- .../test/consensus-test/Test/Consensus/Mempool.hs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs index 16853db861..de4d7ae288 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs @@ -495,10 +495,10 @@ instance CardanoHardForkConstraints c , (NodeToClientV_14, CardanoNodeToClientVersion10) , (NodeToClientV_15, CardanoNodeToClientVersion11) , (NodeToClientV_16, CardanoNodeToClientVersion12) - , (NodeToClientV_17, CardanoNodeToClientVersion13) + , (NodeToClientV_17, CardanoNodeToClientVersion13) ] - latestReleasedNodeVersion _prx = (Just NodeToNodeV_13, Just NodeToClientV_17) + latestReleasedNodeVersion _prx = (Just NodeToNodeV_13, Just NodeToClientV_17) {------------------------------------------------------------------------------- ProtocolInfo diff --git a/ouroboros-consensus/bench/mempool-bench/Main.hs b/ouroboros-consensus/bench/mempool-bench/Main.hs index 7cdbaba17e..bcc45a2db0 100644 --- a/ouroboros-consensus/bench/mempool-bench/Main.hs +++ b/ouroboros-consensus/bench/mempool-bench/Main.hs @@ -22,7 +22,7 @@ import qualified Data.Text as Text import qualified Data.Text.Read as Text.Read import Main.Utf8 (withStdTerminalHandles) import qualified Ouroboros.Consensus.Mempool.Capacity as Mempool -import Ouroboros.Network.SizeInBytes +import Ouroboros.Network.SizeInBytes import System.Exit (die, exitFailure) import qualified Test.Consensus.Mempool.Mocked as Mocked import Test.Consensus.Mempool.Mocked (MockedMempool) diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool.hs index 5d3a5b68ec..d91ad92420 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool.hs @@ -15,8 +15,8 @@ module Ouroboros.Consensus.Mempool ( -- ** Mempool Snapshot , MempoolSnapshot (..) -- ** Re-exports - , TicketNo , SizeInBytes + , TicketNo , zeroTicketNo -- * Mempool capacity , MempoolCapacityBytes (..) @@ -39,7 +39,7 @@ module Ouroboros.Consensus.Mempool ( import Ouroboros.Consensus.Mempool.API (ForgeLedgerState (..), Mempool (..), MempoolAddTxResult (..), - MempoolSnapshot (..), TicketNo, SizeInBytes, addLocalTxs, + MempoolSnapshot (..), SizeInBytes, TicketNo, addLocalTxs, addTxs, isMempoolTxAdded, isMempoolTxRejected, mempoolTxAddedToMaybe, zeroTicketNo) import Ouroboros.Consensus.Mempool.Capacity (ByteSize (..), diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/API.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/API.hs index c64aa5007e..3a321ce7a4 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/API.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/API.hs @@ -25,8 +25,8 @@ module Ouroboros.Consensus.Mempool.API ( -- * Mempool Snapshot , MempoolSnapshot (..) -- * Re-exports - , TicketNo , SizeInBytes + , TicketNo , zeroTicketNo ) where diff --git a/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs b/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs index 844fcff438..126b012ebb 100644 --- a/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs +++ b/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs @@ -597,7 +597,7 @@ instance Arbitrary TestSetupWithTxs where testMempoolCapOverride = if noOverride then NoMempoolCapacityBytesOverride - else MempoolCapacityBytesOverride $ MempoolCapacityBytes $ + else MempoolCapacityBytesOverride $ MempoolCapacityBytes $ mpCap + getSizeInBytes (txSizesInBytes $ map fst txs) } return TestSetupWithTxs { testSetup = testSetup', txs }