Skip to content

Commit e8e80af

Browse files
authored
Merge pull request #1187 from IntersectMBO/jordan/dijkstra-placeholder-unification
Unify Dijkstra-era placeholder messages under TODO Dijkstra
2 parents 77b5af0 + 2020e05 commit e8e80af

17 files changed

Lines changed: 36 additions & 30 deletions

File tree

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
project: cardano-api
2+
pr: 1187
3+
kind:
4+
- maintenance
5+
description: |
6+
Unify Dijkstra-era placeholder `error` messages and `TODO` comments under a single greppable token `TODO Dijkstra:`, so `grep -r 'TODO Dijkstra'` finds every Dijkstra-era placeholder in one shot. No behaviour change.

cardano-api/src/Cardano/Api/Certificate/Internal.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ getAnchorDataFromCertificate c =
826826
Ledger.RetirePoolTxCert _ _ -> return Nothing
827827
Ledger.GenesisDelegTxCert{} -> return Nothing
828828
Ledger.MirTxCert _ -> return Nothing
829-
_ -> error "getAnchorDataFromCertificate: Dijkstra era not supported"
829+
_ -> error "TODO Dijkstra: getAnchorDataFromCertificate: era not supported"
830830
ConwayCertificate ceo ccert ->
831831
conwayEraOnwardsConstraints ceo $
832832
case ccert of
@@ -843,7 +843,7 @@ getAnchorDataFromCertificate c =
843843
Ledger.UpdateDRepTxCert _ mAnchor -> return $ Ledger.strictMaybeToMaybe mAnchor
844844
Ledger.AuthCommitteeHotKeyTxCert _ _ -> return Nothing
845845
Ledger.ResignCommitteeColdTxCert _ mAnchor -> return $ Ledger.strictMaybeToMaybe mAnchor
846-
_ -> error "getAnchorDataFromCertificate: Dijkstra era not supported"
846+
_ -> error "TODO Dijkstra: getAnchorDataFromCertificate: era not supported"
847847
where
848848
anchorDataFromPoolMetadata
849849
:: MonadError AnchorDataFromCertificateError m

cardano-api/src/Cardano/Api/Era/Internal/Case.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ caseByronOrShelleyBasedEra l r = \case
5252
AlonzoEra -> r ShelleyBasedEraAlonzo
5353
BabbageEra -> r ShelleyBasedEraBabbage
5454
ConwayEra -> r ShelleyBasedEraConway
55-
DijkstraEra -> error "caseByronOrShelleyBasedEra: DijkstraEra is not supported"
55+
DijkstraEra -> error "TODO Dijkstra: caseByronOrShelleyBasedEra: era not supported"
5656

5757
-- | @caseByronToAlonzoOrBabbageEraOnwards f g era@ applies @f@ to byron, shelley, allegra, mary, and alonzo;
5858
-- and @g@ to babbage and later eras.
@@ -70,7 +70,7 @@ caseByronToAlonzoOrBabbageEraOnwards l r = \case
7070
AlonzoEra -> l ByronToAlonzoEraAlonzo
7171
BabbageEra -> r BabbageEraOnwardsBabbage
7272
ConwayEra -> r BabbageEraOnwardsConway
73-
DijkstraEra -> error "caseByronToAlonzoOrBabbageEraOnwards: DijkstraEra is not supported"
73+
DijkstraEra -> error "TODO Dijkstra: caseByronToAlonzoOrBabbageEraOnwards: era not supported"
7474

7575
-- | @caseShelleyEraOnlyOrAllegraEraOnwards f g era@ applies @f@ to shelley;
7676
-- and applies @g@ to allegra and later eras.
@@ -87,7 +87,7 @@ caseShelleyEraOnlyOrAllegraEraOnwards l r = \case
8787
ShelleyBasedEraAlonzo -> r AllegraEraOnwardsAlonzo
8888
ShelleyBasedEraBabbage -> r AllegraEraOnwardsBabbage
8989
ShelleyBasedEraConway -> r AllegraEraOnwardsConway
90-
ShelleyBasedEraDijkstra -> error "caseShelleyEraOnlyOrAllegraEraOnwards: DijkstraEra is not supported"
90+
ShelleyBasedEraDijkstra -> error "TODO Dijkstra: caseShelleyEraOnlyOrAllegraEraOnwards: era not supported"
9191

9292
-- | @caseShelleyToAllegraOrMaryEraOnwards f g era@ applies @f@ to shelley and allegra;
9393
-- and applies @g@ to mary and later eras.
@@ -104,7 +104,7 @@ caseShelleyToAllegraOrMaryEraOnwards l r = \case
104104
ShelleyBasedEraAlonzo -> r MaryEraOnwardsAlonzo
105105
ShelleyBasedEraBabbage -> r MaryEraOnwardsBabbage
106106
ShelleyBasedEraConway -> r MaryEraOnwardsConway
107-
ShelleyBasedEraDijkstra -> error "caseShelleyToAllegraOrMaryEraOnwards: DijkstraEra is not supported"
107+
ShelleyBasedEraDijkstra -> error "TODO Dijkstra: caseShelleyToAllegraOrMaryEraOnwards: era not supported"
108108

109109
-- | @caseShelleyToMaryOrAlonzoEraOnwards f g era@ applies @f@ to shelley, allegra, and mary;
110110
-- and applies @g@ to alonzo and later eras.
@@ -121,7 +121,7 @@ caseShelleyToMaryOrAlonzoEraOnwards l r = \case
121121
ShelleyBasedEraAlonzo -> r AlonzoEraOnwardsAlonzo
122122
ShelleyBasedEraBabbage -> r AlonzoEraOnwardsBabbage
123123
ShelleyBasedEraConway -> r AlonzoEraOnwardsConway
124-
ShelleyBasedEraDijkstra -> error "caseShelleyToMaryOrAlonzoEraOnwards: DijkstraEra is not supported"
124+
ShelleyBasedEraDijkstra -> error "TODO Dijkstra: caseShelleyToMaryOrAlonzoEraOnwards: era not supported"
125125

126126
-- | @caseShelleyToAlonzoOrBabbageEraOnwards f g era@ applies @f@ to shelley, allegra, mary, and alonzo;
127127
-- and applies @g@ to babbage and later eras.
@@ -138,7 +138,7 @@ caseShelleyToAlonzoOrBabbageEraOnwards l r = \case
138138
ShelleyBasedEraAlonzo -> l ShelleyToAlonzoEraAlonzo
139139
ShelleyBasedEraBabbage -> r BabbageEraOnwardsBabbage
140140
ShelleyBasedEraConway -> r BabbageEraOnwardsConway
141-
ShelleyBasedEraDijkstra -> error "caseShelleyToAlonzoOrBabbageEraOnwards: DijkstraEra is not supported"
141+
ShelleyBasedEraDijkstra -> error "TODO Dijkstra: caseShelleyToAlonzoOrBabbageEraOnwards: era not supported"
142142

143143
-- | @caseShelleyToBabbageOrConwayEraOnwards f g era@ applies @f@ to eras before conway;
144144
-- and applies @g@ to conway and later eras.
@@ -155,7 +155,7 @@ caseShelleyToBabbageOrConwayEraOnwards l r = \case
155155
ShelleyBasedEraAlonzo -> l ShelleyToBabbageEraAlonzo
156156
ShelleyBasedEraBabbage -> l ShelleyToBabbageEraBabbage
157157
ShelleyBasedEraConway -> r ConwayEraOnwardsConway
158-
ShelleyBasedEraDijkstra -> error "caseShelleyToBabbageOrConwayEraOnwards: DijkstraEra is not supported"
158+
ShelleyBasedEraDijkstra -> error "TODO Dijkstra: caseShelleyToBabbageOrConwayEraOnwards: era not supported"
159159

160160
{-# DEPRECATED shelleyToAlonzoEraToShelleyToBabbageEra "Use convert instead" #-}
161161
shelleyToAlonzoEraToShelleyToBabbageEra

cardano-api/src/Cardano/Api/Era/Internal/Eon/AllegraEraOnwards.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ allegraEraOnwardsConstraints = \case
120120
AllegraEraOnwardsAlonzo -> id
121121
AllegraEraOnwardsBabbage -> id
122122
AllegraEraOnwardsConway -> id
123-
_ -> const $ error "allegraEraOnwardsConstraints: Dijkstra era not supported"
123+
_ -> const $ error "TODO Dijkstra: allegraEraOnwardsConstraints: era not supported"
124124

125125
{-# DEPRECATED allegraEraOnwardsToShelleyBasedEra "Use 'convert' instead." #-}
126126
allegraEraOnwardsToShelleyBasedEra :: AllegraEraOnwards era -> ShelleyBasedEra era

cardano-api/src/Cardano/Api/Era/Internal/Eon/BabbageEraOnwards.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ babbageEraOnwardsConstraints
137137
babbageEraOnwardsConstraints = \case
138138
BabbageEraOnwardsBabbage -> id
139139
BabbageEraOnwardsConway -> id
140-
BabbageEraOnwardsDijkstra -> const $ error "babbageEraOnwardsConstraints: DijkstraEra is currently not supported"
140+
BabbageEraOnwardsDijkstra -> const $ error "TODO Dijkstra: babbageEraOnwardsConstraints: era not supported"
141141

142142
{-# DEPRECATED babbageEraOnwardsToShelleyBasedEra "Use 'convert' instead." #-}
143143
babbageEraOnwardsToShelleyBasedEra :: BabbageEraOnwards era -> ShelleyBasedEra era

cardano-api/src/Cardano/Api/Era/Internal/Eon/ConwayEraOnwards.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ conwayEraOnwardsConstraints
145145
-> a
146146
conwayEraOnwardsConstraints = \case
147147
ConwayEraOnwardsConway -> id
148-
_ -> const $ error "conwayEraOnwardsConstraints: Dijkstra era is not yet supported"
148+
_ -> const $ error "TODO Dijkstra: conwayEraOnwardsConstraints: era not supported"
149149

150150
{-# DEPRECATED conwayEraOnwardsToShelleyBasedEra "Use 'convert' instead." #-}
151151
conwayEraOnwardsToShelleyBasedEra :: ConwayEraOnwards era -> ShelleyBasedEra era

cardano-api/src/Cardano/Api/Era/Internal/Eon/MaryEraOnwards.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ maryEraOnwardsConstraints = \case
121121
MaryEraOnwardsAlonzo -> id
122122
MaryEraOnwardsBabbage -> id
123123
MaryEraOnwardsConway -> id
124-
MaryEraOnwardsDijkstra -> const $ error "maryEraOnwardsConstraints: Dijkstra era is not yet supported"
124+
MaryEraOnwardsDijkstra -> const $ error "TODO Dijkstra: maryEraOnwardsConstraints: era not supported"
125125

126126
{-# DEPRECATED maryEraOnwardsToShelleyBasedEra "Use 'convert' instead." #-}
127127
maryEraOnwardsToShelleyBasedEra :: MaryEraOnwards era -> ShelleyBasedEra era

cardano-api/src/Cardano/Api/Era/Internal/Eon/ShelleyBasedEra.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ shelleyBasedEraConstraints = \case
261261
ShelleyBasedEraAlonzo -> id
262262
ShelleyBasedEraBabbage -> id
263263
ShelleyBasedEraConway -> id
264-
ShelleyBasedEraDijkstra -> const $ error "shelleyBasedEraConstraints: Dijkstra is not yet supported"
264+
ShelleyBasedEraDijkstra -> const $ error "TODO Dijkstra: shelleyBasedEraConstraints: era not supported"
265265

266266
data AnyShelleyBasedEra where
267267
AnyShelleyBasedEra

cardano-api/src/Cardano/Api/Experimental/Tx/Internal/AnyWitness.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ getPlutusDatum
125125
getPlutusDatum L.SPlutusV1 (SpendingScriptDatum d) = Just d
126126
getPlutusDatum L.SPlutusV2 (SpendingScriptDatum d) = Just d
127127
getPlutusDatum L.SPlutusV3 (SpendingScriptDatum d) = d
128-
getPlutusDatum L.SPlutusV4 (SpendingScriptDatum _d) = error "getPlutusDatum: Dijkstra era not supported"
128+
getPlutusDatum L.SPlutusV4 (SpendingScriptDatum _d) = error "TODO Dijkstra: getPlutusDatum: era not supported"
129129
getPlutusDatum _ InlineDatum = Nothing
130130
getPlutusDatum _ NoScriptDatum = Nothing
131131

cardano-api/src/Cardano/Api/Experimental/Tx/Internal/BodyContent/New.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ makeUnsignedTx
194194
. Era era
195195
-> TxBodyContent (LedgerEra era)
196196
-> Either MakeUnsignedTxError (UnsignedTx (LedgerEra era))
197-
makeUnsignedTx DijkstraEra _ = error "makeUnsignedTx: Dijkstra era not supported yet"
197+
makeUnsignedTx DijkstraEra _ = error "TODO Dijkstra: makeUnsignedTx: era not supported"
198198
makeUnsignedTx era@ConwayEra bc = obtainCommonConstraints era $ do
199199
let TxScriptWitnessRequirements languages scripts datums redeemers = collectTxBodyScriptWitnessRequirements bc
200200

@@ -846,7 +846,7 @@ extractWitnessableVotes
846846
extractWitnessableVotes Nothing = []
847847
extractWitnessableVotes (Just txVoteProc) =
848848
case useEra @era of
849-
DijkstraEra -> error "extractWitnessableVotes: Dijkstra era not supported"
849+
DijkstraEra -> error "TODO Dijkstra: extractWitnessableVotes: era not supported"
850850
ConwayEra ->
851851
List.nub
852852
[ (WitVote vote, wit)

0 commit comments

Comments
 (0)