Skip to content

Commit 39c4ab5

Browse files
authored
Test.Consensus.Cardano.Translation: minor simplification (#1595)
Small follow-up to #1567 (comment)
2 parents b4b1749 + 49f7040 commit 39c4ab5

File tree

1 file changed

+8
-30
lines changed
  • ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano

1 file changed

+8
-30
lines changed

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Translation.hs

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,20 @@ import Cardano.Ledger.Shelley.UTxO (UTxO (..))
3939
import Cardano.Slotting.EpochInfo (fixedEpochInfo)
4040
import Cardano.Slotting.Slot (EpochNo (..))
4141
import qualified Data.Map.Strict as Map
42-
import Data.SOP.BasicFunctors
43-
import Data.SOP.Functors
4442
import Data.SOP.InPairs (RequiringBoth (..), provideBoth)
4543
import Ouroboros.Consensus.BlockchainTime.WallClock.Types
4644
( slotLengthFromSec
4745
)
4846
import Ouroboros.Consensus.Byron.Ledger (ByronBlock, byronLedgerState)
4947
import Ouroboros.Consensus.Cardano.Block (CardanoEras)
50-
import Ouroboros.Consensus.Cardano.CanHardFork
5148
import Ouroboros.Consensus.Cardano.CanHardFork ()
5249
import Ouroboros.Consensus.HardFork.Combinator
5350
( InPairs (..)
5451
, hardForkEraTranslation
5552
, translateLedgerState
5653
)
5754
import Ouroboros.Consensus.HardFork.Combinator.State.Types
58-
( TranslateLedgerState (TranslateLedgerState, translateLedgerStateWith)
55+
( TranslateLedgerState (..)
5956
)
6057
import Ouroboros.Consensus.Ledger.Basics
6158
( LedgerCfg
@@ -65,7 +62,6 @@ import Ouroboros.Consensus.Ledger.Basics
6562
import Ouroboros.Consensus.Ledger.Tables hiding (TxIn)
6663
import Ouroboros.Consensus.Ledger.Tables.Diff (Diff)
6764
import qualified Ouroboros.Consensus.Ledger.Tables.Diff as Diff
68-
import Ouroboros.Consensus.Ledger.Tables.Utils
6965
import Ouroboros.Consensus.Protocol.Praos
7066
import Ouroboros.Consensus.Protocol.TPraos (TPraos)
7167
import Ouroboros.Consensus.Shelley.Eras
@@ -191,6 +187,12 @@ babbageToConwayLedgerStateTranslation ::
191187
TranslateLedgerState
192188
(ShelleyBlock (Praos Crypto) BabbageEra)
193189
(ShelleyBlock (Praos Crypto) ConwayEra)
190+
conwayToDijkstraLedgerStateTranslation ::
191+
RequiringBoth
192+
WrapLedgerConfig
193+
TranslateLedgerState
194+
(ShelleyBlock (Praos Crypto) ConwayEra)
195+
(ShelleyBlock (Praos Crypto) DijkstraEra)
194196
PCons
195197
byronToShelleyLedgerStateTranslation
196198
( PCons
@@ -204,7 +206,7 @@ PCons
204206
( PCons
205207
babbageToConwayLedgerStateTranslation
206208
( PCons
207-
_
209+
conwayToDijkstraLedgerStateTranslation
208210
PNil
209211
)
210212
)
@@ -219,30 +221,6 @@ PCons
219221
(CardanoEras Crypto)
220222
tls = translateLedgerState hardForkEraTranslation
221223

222-
conwayToDijkstraLedgerStateTranslation ::
223-
RequiringBoth
224-
WrapLedgerConfig
225-
TranslateLedgerState
226-
(ShelleyBlock (Praos Crypto) ConwayEra)
227-
(ShelleyBlock (Praos Crypto) DijkstraEra)
228-
conwayToDijkstraLedgerStateTranslation = translateLedgerStateConwayToDijkstraWrapper
229-
230-
translateLedgerStateConwayToDijkstraWrapper ::
231-
RequiringBoth
232-
WrapLedgerConfig
233-
TranslateLedgerState
234-
(ShelleyBlock (Praos Crypto) ConwayEra)
235-
(ShelleyBlock (Praos Crypto) DijkstraEra)
236-
translateLedgerStateConwayToDijkstraWrapper =
237-
RequireBoth $ \_ cfgDijkstra ->
238-
TranslateLedgerState $ \_ ->
239-
noNewTickingDiffs
240-
. unFlip
241-
. unComp
242-
. Core.translateEra' (getDijkstraTranslationContext cfgDijkstra)
243-
. Comp
244-
. Flip
245-
246224
-- | Check that the tables are correctly translated from one era to the next.
247225
testTablesTranslation ::
248226
forall srcBlk dstBlk.

0 commit comments

Comments
 (0)