Skip to content

Commit a1f79ae

Browse files
SoupstrawSoupstraw
committed
fourmolize
1 parent 303b86f commit a1f79ae

File tree

20 files changed

+129
-65
lines changed

20 files changed

+129
-65
lines changed

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra.hs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
{-# LANGUAGE TypeApplications #-}
21
{-# LANGUAGE DataKinds #-}
2+
{-# LANGUAGE TypeApplications #-}
33
{-# OPTIONS_GHC -Wno-orphans #-}
4+
45
module Cardano.Ledger.Dijkstra (DijkstraEra) where
56

7+
import Cardano.Ledger.Conway.Governance (RunConwayRatify)
68
import Cardano.Ledger.Dijkstra.Era
79
import Cardano.Ledger.Dijkstra.Genesis ()
810
import Cardano.Ledger.Dijkstra.Governance ()
@@ -13,11 +15,10 @@ import Cardano.Ledger.Dijkstra.State.Stake ()
1315
import Cardano.Ledger.Dijkstra.Translation ()
1416
import Cardano.Ledger.Dijkstra.Tx ()
1517
import Cardano.Ledger.Dijkstra.TxBody ()
16-
import Cardano.Ledger.Dijkstra.TxWits ()
1718
import Cardano.Ledger.Dijkstra.TxInfo ()
19+
import Cardano.Ledger.Dijkstra.TxWits ()
1820
import Cardano.Ledger.Dijkstra.UTxO ()
19-
import Cardano.Ledger.Shelley.API (ApplyTx (..), ApplyBlock, ruleApplyTxValidation)
20-
import Cardano.Ledger.Conway.Governance (RunConwayRatify)
21+
import Cardano.Ledger.Shelley.API (ApplyBlock, ApplyTx (..), ruleApplyTxValidation)
2122

2223
instance ApplyTx DijkstraEra where
2324
applyTxValidation = ruleApplyTxValidation @"MEMPOOL"

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra/Genesis.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{-# LANGUAGE TypeFamilies #-}
22
{-# OPTIONS_GHC -Wno-orphans #-}
3+
34
module Cardano.Ledger.Dijkstra.Genesis () where
45

56
import Cardano.Ledger.Dijkstra.Era (DijkstraEra)

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra/Rules/Cert.hs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
{-# LANGUAGE DataKinds #-}
2-
{-# LANGUAGE TypeFamilies #-}
32
{-# LANGUAGE MultiParamTypeClasses #-}
3+
{-# LANGUAGE TypeFamilies #-}
44
{-# OPTIONS_GHC -Wno-orphans #-}
55

66
module Cardano.Ledger.Dijkstra.Rules.Cert () where
7-
import Cardano.Ledger.Dijkstra.Core (EraRuleFailure, EraRuleEvent, InjectRuleFailure (..))
7+
8+
import Cardano.Ledger.Conway.Rules (
9+
ConwayCertEvent,
10+
ConwayCertPredFailure (..),
11+
ConwayDelegPredFailure,
12+
ConwayGovCertPredFailure,
13+
)
14+
import Cardano.Ledger.Dijkstra.Core (EraRuleEvent, EraRuleFailure, InjectRuleFailure (..))
815
import Cardano.Ledger.Dijkstra.Era (DijkstraEra)
9-
import Cardano.Ledger.Conway.Rules (ConwayCertPredFailure (..), ConwayCertEvent, ConwayDelegPredFailure, ConwayGovCertPredFailure)
1016
import Cardano.Ledger.Shelley.Rules (ShelleyPoolPredFailure)
1117

1218
type instance EraRuleFailure "CERT" DijkstraEra = ConwayCertPredFailure DijkstraEra

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra/Rules/Ledger.hs‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
11
{-# LANGUAGE DataKinds #-}
2-
{-# LANGUAGE TypeFamilies #-}
32
{-# LANGUAGE MultiParamTypeClasses #-}
3+
{-# LANGUAGE TypeFamilies #-}
44
{-# OPTIONS_GHC -Wno-orphans #-}
55

66
module Cardano.Ledger.Dijkstra.Rules.Ledger () where
7-
import Cardano.Ledger.Dijkstra.Core (EraRuleFailure, EraRuleEvent, InjectRuleFailure (..))
8-
import Cardano.Ledger.Dijkstra.Era (DijkstraEra)
9-
import Cardano.Ledger.Conway.Rules (ConwayLedgerPredFailure (..), ConwayLedgerEvent, ConwayUtxowPredFailure, ConwayUtxoPredFailure, ConwayUtxosPredFailure, ConwayCertsPredFailure, ConwayCertPredFailure, ConwayDelegPredFailure, ConwayGovCertPredFailure, ConwayGovPredFailure)
10-
import Cardano.Ledger.Babbage.Rules (BabbageUtxowPredFailure, BabbageUtxoPredFailure)
11-
import Cardano.Ledger.Alonzo.Rules (AlonzoUtxowPredFailure, AlonzoUtxoPredFailure, AlonzoUtxosPredFailure)
12-
import Cardano.Ledger.Shelley.Rules (ShelleyUtxowPredFailure, ShelleyUtxoPredFailure, ShelleyPoolPredFailure)
7+
138
import Cardano.Ledger.Allegra.Rules (AllegraUtxoPredFailure)
14-
import Cardano.Ledger.Dijkstra.Rules.Utxow ()
9+
import Cardano.Ledger.Alonzo.Rules (
10+
AlonzoUtxoPredFailure,
11+
AlonzoUtxosPredFailure,
12+
AlonzoUtxowPredFailure,
13+
)
14+
import Cardano.Ledger.Babbage.Rules (BabbageUtxoPredFailure, BabbageUtxowPredFailure)
15+
import Cardano.Ledger.Conway.Rules (
16+
ConwayCertPredFailure,
17+
ConwayCertsPredFailure,
18+
ConwayDelegPredFailure,
19+
ConwayGovCertPredFailure,
20+
ConwayGovPredFailure,
21+
ConwayLedgerEvent,
22+
ConwayLedgerPredFailure (..),
23+
ConwayUtxoPredFailure,
24+
ConwayUtxosPredFailure,
25+
ConwayUtxowPredFailure,
26+
)
27+
import Cardano.Ledger.Dijkstra.Core (EraRuleEvent, EraRuleFailure, InjectRuleFailure (..))
28+
import Cardano.Ledger.Dijkstra.Era (DijkstraEra)
1529
import Cardano.Ledger.Dijkstra.Rules.Certs ()
30+
import Cardano.Ledger.Dijkstra.Rules.Utxow ()
31+
import Cardano.Ledger.Shelley.Rules (
32+
ShelleyPoolPredFailure,
33+
ShelleyUtxoPredFailure,
34+
ShelleyUtxowPredFailure,
35+
)
1636

1737
type instance EraRuleFailure "LEDGER" DijkstraEra = ConwayLedgerPredFailure DijkstraEra
1838

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra/Rules/Ledgers.hs‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,17 @@ import Cardano.Ledger.Alonzo.Rules (
1212
AlonzoUtxowPredFailure,
1313
)
1414
import Cardano.Ledger.Babbage.Rules (BabbageUtxoPredFailure, BabbageUtxowPredFailure)
15-
import Cardano.Ledger.Conway.Rules (
16-
ConwayCertPredFailure,
17-
ConwayCertsPredFailure,
18-
ConwayDelegPredFailure,
19-
ConwayGovCertPredFailure,
20-
ConwayGovPredFailure,
21-
ConwayLedgerPredFailure,
22-
ConwayUtxoPredFailure,
23-
ConwayUtxosPredFailure,
24-
ConwayUtxowPredFailure,
25-
)
15+
import Cardano.Ledger.Conway.Rules (ConwayCertPredFailure, ConwayCertsPredFailure, ConwayDelegPredFailure, ConwayGovCertPredFailure, ConwayGovPredFailure, ConwayLedgerPredFailure, ConwayUtxoPredFailure, ConwayUtxosPredFailure, ConwayUtxowPredFailure)
2616
import Cardano.Ledger.Dijkstra.Core (EraRuleEvent, EraRuleFailure, InjectRuleFailure (..))
2717
import Cardano.Ledger.Dijkstra.Era (DijkstraEra)
18+
import Cardano.Ledger.Dijkstra.Rules.Ledger ()
2819
import Cardano.Ledger.Shelley.Rules (
2920
ShelleyLedgersEvent,
3021
ShelleyLedgersPredFailure (..),
3122
ShelleyPoolPredFailure,
3223
ShelleyUtxoPredFailure,
3324
ShelleyUtxowPredFailure,
3425
)
35-
import Cardano.Ledger.Conway.Rules ()
36-
import Cardano.Ledger.Dijkstra.Rules.Ledger ()
3726

3827
type instance EraRuleFailure "LEDGERS" DijkstraEra = ShelleyLedgersPredFailure DijkstraEra
3928

@@ -45,7 +34,7 @@ instance InjectRuleFailure "LEDGERS" ConwayLedgerPredFailure DijkstraEra where
4534
injectFailure = LedgerFailure
4635

4736
instance InjectRuleFailure "LEDGERS" ConwayUtxowPredFailure DijkstraEra where
48-
injectFailure = LedgerFailure . injectFailure
37+
injectFailure = LedgerFailure . injectFailure
4938

5039
instance InjectRuleFailure "LEDGERS" BabbageUtxowPredFailure DijkstraEra where
5140
injectFailure = LedgerFailure . injectFailure

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra/Rules/Utxo.hs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
{-# LANGUAGE DataKinds #-}
2-
{-# LANGUAGE TypeFamilies #-}
32
{-# LANGUAGE MultiParamTypeClasses #-}
3+
{-# LANGUAGE TypeFamilies #-}
44
{-# OPTIONS_GHC -Wno-orphans #-}
55

66
module Cardano.Ledger.Dijkstra.Rules.Utxo () where
77

8+
import Cardano.Ledger.Allegra.Rules (shelleyToAllegraUtxoPredFailure)
89
import qualified Cardano.Ledger.Allegra.Rules as Allegra
9-
import Cardano.Ledger.Alonzo.Rules (AlonzoUtxoEvent, AlonzoUtxosPredFailure, AlonzoUtxoPredFailure)
10+
import Cardano.Ledger.Alonzo.Rules (AlonzoUtxoEvent, AlonzoUtxoPredFailure, AlonzoUtxosPredFailure)
11+
import qualified Cardano.Ledger.Alonzo.Rules as Alonzo
1012
import Cardano.Ledger.Babbage.Rules (BabbageUtxoPredFailure)
11-
import Cardano.Ledger.Conway.Rules (ConwayUtxoPredFailure (..), ConwayUtxosPredFailure, babbageToConwayUtxoPredFailure, alonzoToConwayUtxoPredFailure, allegraToConwayUtxoPredFailure)
13+
import Cardano.Ledger.Conway.Rules (
14+
ConwayUtxoPredFailure (..),
15+
ConwayUtxosPredFailure,
16+
allegraToConwayUtxoPredFailure,
17+
alonzoToConwayUtxoPredFailure,
18+
babbageToConwayUtxoPredFailure,
19+
)
1220
import Cardano.Ledger.Dijkstra.Core (EraRuleEvent, EraRuleFailure, InjectRuleFailure (..))
1321
import Cardano.Ledger.Dijkstra.Era (DijkstraEra)
1422
import Cardano.Ledger.Dijkstra.Rules.Utxos ()
1523
import Cardano.Ledger.Shelley.Rules (ShelleyUtxoPredFailure)
16-
import Cardano.Ledger.Allegra.Rules (shelleyToAllegraUtxoPredFailure)
17-
import qualified Cardano.Ledger.Alonzo.Rules as Alonzo
1824

1925
type instance EraRuleFailure "UTXO" DijkstraEra = ConwayUtxoPredFailure DijkstraEra
2026

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra/Rules/Utxos.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import Cardano.Ledger.Conway.Rules (
1212
alonzoToConwayUtxosEvent,
1313
alonzoToConwayUtxosPredFailure,
1414
)
15-
import Cardano.Ledger.Dijkstra.Era (DijkstraEra)
1615
import Cardano.Ledger.Dijkstra.Core (
1716
EraRuleEvent,
1817
EraRuleFailure,
1918
InjectRuleEvent (..),
2019
InjectRuleFailure (..),
2120
)
21+
import Cardano.Ledger.Dijkstra.Era (DijkstraEra)
2222

2323
type instance EraRuleFailure "UTXOS" DijkstraEra = ConwayUtxosPredFailure DijkstraEra
2424

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra/Scripts.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
55
{-# LANGUAGE LambdaCase #-}
66
{-# LANGUAGE TypeFamilies #-}
7-
{-# OPTIONS_GHC -Wno-orphans #-}
87
{-# LANGUAGE UndecidableInstances #-}
8+
{-# OPTIONS_GHC -Wno-orphans #-}
99

1010
module Cardano.Ledger.Dijkstra.Scripts (PlutusScript (..)) where
1111

@@ -41,8 +41,8 @@ import Cardano.Ledger.Plutus (Language (..))
4141
import Cardano.Ledger.Shelley.Scripts (ShelleyEraScript (..))
4242
import Control.DeepSeq (NFData)
4343
import Data.MemPack (MemPack (..))
44-
import NoThunks.Class (NoThunks)
4544
import GHC.Generics (Generic)
45+
import NoThunks.Class (NoThunks)
4646

4747
instance EraScript DijkstraEra where
4848
type Script DijkstraEra = AlonzoScript DijkstraEra

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra/State/Stake.hs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
{-# LANGUAGE TypeFamilies #-}
22
{-# OPTIONS_GHC -Wno-orphans #-}
3+
34
module Cardano.Ledger.Dijkstra.State.Stake () where
4-
import Cardano.Ledger.Conway.State (EraStake (..), ConwayInstantStake, conwayInstantStakeCredentialsL, addConwayInstantStake, deleteConwayInstantStake, resolveConwayInstantStake)
5+
6+
import Cardano.Ledger.Conway.State (
7+
ConwayInstantStake,
8+
EraStake (..),
9+
addConwayInstantStake,
10+
conwayInstantStakeCredentialsL,
11+
deleteConwayInstantStake,
12+
resolveConwayInstantStake,
13+
)
514
import Cardano.Ledger.Dijkstra.Era (DijkstraEra)
615
import Cardano.Ledger.Dijkstra.TxOut ()
716

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra/Translation.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ import Cardano.Ledger.Core (
3333
)
3434
import qualified Cardano.Ledger.Core as Core
3535
import Cardano.Ledger.Dijkstra.Era (DijkstraEra)
36+
import Cardano.Ledger.Dijkstra.Governance ()
37+
import Cardano.Ledger.Dijkstra.State.CertState ()
3638
import Cardano.Ledger.Dijkstra.Tx ()
3739
import Cardano.Ledger.Dijkstra.TxAuxData ()
3840
import Cardano.Ledger.Dijkstra.TxBody ()
3941
import Cardano.Ledger.Dijkstra.TxWits ()
40-
import Cardano.Ledger.Dijkstra.Governance ()
41-
import Cardano.Ledger.Dijkstra.State.CertState ()
4242
import qualified Cardano.Ledger.Shelley.API as API
4343
import Cardano.Ledger.Shelley.LedgerState (
4444
DState (..),

0 commit comments

Comments
 (0)