Skip to content

Commit b70b3cc

Browse files
committed
TOSQUASH stylish
1 parent b890152 commit b70b3cc

File tree

6 files changed

+19
-21
lines changed

6 files changed

+19
-21
lines changed

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/MiniProtocol/LocalTxSubmission/Server.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import Ouroboros.Consensus.MiniProtocol.LocalTxSubmission.Server
2727
(TraceLocalTxSubmissionServerEvent,
2828
localTxSubmissionServer)
2929
import Ouroboros.Consensus.Node.ProtocolInfo
30-
import Ouroboros.Consensus.Shelley.Ledger.Mempool
31-
(AlonzoMeasure (..),
30+
import Ouroboros.Consensus.Shelley.Ledger.Mempool (AlonzoMeasure (..),
3231
ConwayMeasure (..))
3332
import Ouroboros.Network.Protocol.LocalTxSubmission.Client
3433
(SubmitResult, localTxSubmissionClientPeer)

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Abstract/CanHardFork.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
module Ouroboros.Consensus.HardFork.Combinator.Abstract.CanHardFork (CanHardFork (..)) where
1010

11-
import NoThunks.Class (NoThunks)
1211
import Data.Measure (BoundedMeasure)
1312
import Data.SOP.Constraint
1413
import Data.SOP.Functors (Product2)
@@ -19,6 +18,7 @@ import qualified Data.SOP.Strict as SOP
1918
import Data.SOP.Tails (Tails)
2019
import qualified Data.SOP.Tails as Tails
2120
import Data.Typeable
21+
import NoThunks.Class (NoThunks)
2222
import Ouroboros.Consensus.HardFork.Combinator.Abstract.SingleEraBlock
2323
import Ouroboros.Consensus.HardFork.Combinator.InjectTxs
2424
import Ouroboros.Consensus.HardFork.Combinator.Protocol.ChainSel

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Mempool.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,14 @@ import Ouroboros.Consensus.HardFork.Combinator.Basics
4747
import Ouroboros.Consensus.HardFork.Combinator.Info
4848
import Ouroboros.Consensus.HardFork.Combinator.InjectTxs
4949
import Ouroboros.Consensus.HardFork.Combinator.Ledger (Ticked (..))
50+
import Ouroboros.Consensus.HardFork.Combinator.PartialConfig
51+
(WrapPartialLedgerConfig (..))
5052
import qualified Ouroboros.Consensus.HardFork.Combinator.State as State
5153
import Ouroboros.Consensus.Ledger.Abstract
5254
import Ouroboros.Consensus.Ledger.SupportsMempool
5355
import Ouroboros.Consensus.TypeFamilyWrappers
5456
import Ouroboros.Consensus.Util (ShowProxy)
5557

56-
import Ouroboros.Consensus.HardFork.Combinator.PartialConfig
57-
(WrapPartialLedgerConfig (..))
58-
5958
data HardForkApplyTxErr xs =
6059
-- | Validation error from one of the eras
6160
HardForkApplyTxErrFromEra !(OneEraApplyTxErr xs)

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Impl/Common.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,28 +69,28 @@ data InternalState blk = IS {
6969
--
7070
-- See the note on 'MempoolCapacity' about the mempool possibly being
7171
-- over-capacity.
72-
isTxs :: !(TxSeq (TxMeasure blk) (Validated (GenTx blk)))
72+
isTxs :: !(TxSeq (TxMeasure blk) (Validated (GenTx blk)))
7373

7474
-- | The cached IDs of transactions currently in the mempool.
7575
--
7676
-- This allows one to more quickly lookup transactions by ID from a
7777
-- 'MempoolSnapshot' (see 'snapshotHasTx').
7878
--
7979
-- This should always be in-sync with the transactions in 'isTxs'.
80-
, isTxIds :: !(Set (GenTxId blk))
80+
, isTxIds :: !(Set (GenTxId blk))
8181

8282
-- | The cached ledger state after applying the transactions in the
8383
-- Mempool against the chain's ledger state. New transactions will be
8484
-- validated against this ledger.
8585
--
8686
-- INVARIANT: 'isLedgerState' is the ledger resulting from applying the
8787
-- transactions in 'isTxs' against the ledger identified 'isTip' as tip.
88-
, isLedgerState :: !(TickedLedgerState blk)
88+
, isLedgerState :: !(TickedLedgerState blk)
8989

9090
-- | The tip of the chain that 'isTxs' was validated against
9191
--
9292
-- This comes from the underlying ledger state ('tickedLedgerState')
93-
, isTip :: !(ChainHash blk)
93+
, isTip :: !(ChainHash blk)
9494

9595
-- | The most recent 'SlotNo' that 'isTxs' was validated against
9696
--
@@ -99,7 +99,7 @@ data InternalState blk = IS {
9999
-- slot, see 'tickLedgerState') and 'isSlotNo' will be set to @succ s@,
100100
-- which is different from the slot of the original ledger state, which
101101
-- will remain in 'isTip'.
102-
, isSlotNo :: !SlotNo
102+
, isSlotNo :: !SlotNo
103103

104104
-- | The mempool 'TicketNo' counter.
105105
--
@@ -108,7 +108,7 @@ data InternalState blk = IS {
108108

109109
-- | The capacity of a block according to the ledger state the mempool
110110
-- was most recently synchronized with.
111-
, isCapacity :: !(MempoolCapacity blk)
111+
, isCapacity :: !(MempoolCapacity blk)
112112
}
113113
deriving (Generic)
114114

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/TxSeq.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ zeroTicketNo = TicketNo 0
5858
-- their size.
5959
--
6060
data TxTicket sz tx = TxTicket
61-
{ txTicketTx :: !tx
61+
{ txTicketTx :: !tx
6262
-- ^ The transaction associated with this ticket.
63-
, txTicketNo :: !TicketNo
63+
, txTicketNo :: !TicketNo
6464
-- ^ The ticket number.
65-
, txTicketSize :: !sz
65+
, txTicketSize :: !sz
6666
-- ^ The possibly-multi-dimensional size of the transaction ('txTicketTx')
6767
-- associated with this ticket.
6868
} deriving (Eq, Show, Generic, NoThunks)
@@ -104,10 +104,10 @@ instance Measure sz => Foldable (TxSeq sz) where
104104
-- instance.
105105
--
106106
data TxSeqMeasure sz = TxSeqMeasure {
107-
mCount :: !Int,
108-
mMinTicket :: !TicketNo,
109-
mMaxTicket :: !TicketNo,
110-
mSizeCumu :: !sz
107+
mCount :: !Int,
108+
mMinTicket :: !TicketNo,
109+
mMaxTicket :: !TicketNo,
110+
mSizeCumu :: !sz
111111
}
112112
deriving Show
113113

ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ import qualified Ouroboros.Consensus.HardFork.History as HardFork
5757
import Ouroboros.Consensus.Ledger.Abstract
5858
import Ouroboros.Consensus.Ledger.SupportsMempool
5959
import Ouroboros.Consensus.Mempool
60-
import Ouroboros.Consensus.Mempool.TxSeq (TxSeq, TxTicket (..),
61-
TicketNo (..))
60+
import Ouroboros.Consensus.Mempool.TxSeq (TicketNo (..), TxSeq,
61+
TxTicket (..))
6262
import qualified Ouroboros.Consensus.Mempool.TxSeq as TxSeq
6363
import Ouroboros.Consensus.Mock.Ledger hiding (TxId)
6464
import Ouroboros.Consensus.Node.ProtocolInfo (NumCoreNodes (..))

0 commit comments

Comments
 (0)