Skip to content

Commit 8747880

Browse files
committed
IntersectMBO/cardano-cli#85 Fix node crashing in babbage due to conway integration
1 parent 6f1dd12 commit 8747880

File tree

1 file changed

+14
-20
lines changed
  • cardano-node/src/Cardano/Tracing/OrphanInstances

1 file changed

+14
-20
lines changed

cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ instance
134134
) => ToObject (ShelleyLedgerError ledgerera) where
135135
toObject verb (BBodyError (BlockTransitionError fs)) =
136136
mconcat [ "kind" .= String "BBodyError"
137-
, "failures" .= map (toObject verb) fs
138-
]
137+
, "failures" .= map (toObject verb) fs
138+
]
139139

140140
instance
141141
( Ledger.Era ledgerera
@@ -264,7 +264,7 @@ instance
264264
, ToObject (PredicateFailure (Core.EraRule "UTXOW" ledgerera))
265265
) => ToObject (ShelleyLedgerPredFailure ledgerera) where
266266
toObject verb (UtxowFailure f) = toObject verb f
267-
toObject _verb (DelegsFailure _f) = error "TODO: Conway era" --toObject verb f
267+
toObject verb (DelegsFailure f) = toObject verb f
268268

269269
instance
270270
( ToObject (PredicateFailure (Core.EraRule "CERTS" ledgerera))
@@ -284,23 +284,17 @@ instance ToObject (Conway.ConwayTallyPredFailure era) where
284284
, "govActionId" .= govActionIdToText govActionId
285285
]
286286

287-
-- TODO: Implement
288-
instance ToObject (Conway.ConwayCertsPredFailure era) where
289-
toObject _ _ = mempty
290-
291-
-- instance
292-
-- ( ToObject (PredicateFailure (Ledger.EraRule "CERT" ledgerera))
293-
-- ) => ToObject (Conway.ConwayDelegsPredFailure ledgerera) where
294-
-- toObject _ (Conway.DelegateeNotRegisteredDELEG poolID) =
295-
-- mconcat [ "kind" .= String "DelegateeNotRegisteredDELEG"
296-
-- , "poolID" .= String (textShow poolID)
297-
-- ]
298-
-- toObject _ (Conway.WithdrawalsNotInRewardsDELEGS rs) =
299-
-- mconcat [ "kind" .= String "WithdrawalsNotInRewardsDELEGS"
300-
-- , "rewardAccounts" .= rs
301-
-- ]
302-
-- toObject v (Conway.CertFailure certFailure) =
303-
-- toObject v certFailure
287+
instance
288+
( Core.Crypto (Consensus.EraCrypto era)
289+
, ToObject (PredicateFailure (Ledger.EraRule "CERT" era))
290+
) => ToObject (Conway.ConwayCertsPredFailure era) where
291+
toObject verb = \case
292+
Conway.DelegateeNotRegisteredDELEG targetPool ->
293+
mconcat [ "kind" .= String "DelegateeNotRegisteredDELEG" , "targetPool" .= targetPool ]
294+
Conway.WithdrawalsNotInRewardsCERTS incorrectWithdrawals ->
295+
mconcat [ "kind" .= String "WithdrawalsNotInRewardsCERTS" , "incorrectWithdrawals" .= incorrectWithdrawals ]
296+
Conway.CertFailure f -> toObject verb f
297+
304298

305299
instance
306300
( ToObject (PPUPPredFailure ledgerera)

0 commit comments

Comments
 (0)