Skip to content

Shelley: check thunks for GenTx #2010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2020
Merged

Shelley: check thunks for GenTx #2010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE DeriveAnyClass #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE DerivingVia #-}
Expand All @@ -23,8 +24,8 @@ import Data.Foldable (toList)
import qualified Data.Sequence as Seq
import GHC.Generics (Generic)

import Cardano.Binary (FromCBOR (..), ToCBOR (..),
FullByteString (..), Annotator (..))
import Cardano.Binary (Annotator (..), FromCBOR (..),
FullByteString (..), ToCBOR (..))
import Cardano.Prelude (NoUnexpectedThunks (..), UseIsNormalForm (..))

import Ouroboros.Network.Block (unwrapCBORinCBOR, wrapCBORinCBOR)
Expand All @@ -49,9 +50,8 @@ type ShelleyTxId c = SL.TxId c
instance TPraosCrypto c => ApplyTx (ShelleyBlock c) where

data GenTx (ShelleyBlock c) = ShelleyTx !(ShelleyTxId c) !(SL.Tx c)
deriving (Eq, Generic)
-- TODO
deriving (NoUnexpectedThunks) via UseIsNormalForm (GenTx (ShelleyBlock c))
deriving stock (Eq, Generic)
deriving anyclass (NoUnexpectedThunks)

type ApplyTxErr (ShelleyBlock c) = SL.ApplyTxError c

Expand Down