Remove orphan ToJSON instances that were moved to ledger

IntersectMBO · Apr 10, 2024 · c272a12 · c272a12
1 parent a5775ec
commit c272a12
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 38 deletions.
diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -148,8 +148,8 @@ library
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>=0.2.2
-                      , cardano-ledger-alonzo
-                      , cardano-ledger-allegra
+                      , cardano-ledger-alonzo >=1.7.1
+                      , cardano-ledger-allegra >=1.4.1
                       , cardano-ledger-api
                       , cardano-ledger-babbage
                       , cardano-ledger-byron

diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs
@@ -571,16 +571,6 @@ instance
              , "addrs"   .= addrs
              ]
 
-
-instance ToJSON Allegra.ValidityInterval where
-  toJSON vi =
-    Aeson.object $
-        [ "invalidBefore"    .= x | x <- mbfield (Allegra.invalidBefore    vi) ]
-     ++ [ "invalidHereafter" .= x | x <- mbfield (Allegra.invalidHereafter vi) ]
-    where
-      mbfield SNothing  = []
-      mbfield (SJust x) = [x]
-
 instance
   ( ToObject (Ledger.EraRuleFailure "PPUP" ledgerera)
   , ToJSON (Ledger.TxOut ledgerera)
@@ -1150,32 +1140,6 @@ instance
   toObject verb (Alonzo.UpdateFailure pFailure) =
     toObject verb pFailure
 
-deriving newtype instance ToJSON Alonzo.IsValid
-
-instance ToJSON Alonzo.TagMismatchDescription where
-  toJSON tmd = case tmd of
-    Alonzo.PassedUnexpectedly ->
-      object
-        [ "kind" .= String "TagMismatchDescription"
-        , "error" .= String "PassedUnexpectedly"
-        ]
-    Alonzo.FailedUnexpectedly forReasons ->
-      object
-        [ "kind" .= String "TagMismatchDescription"
-        , "error" .= String "FailedUnexpectedly"
-        , "reconstruction" .= forReasons
-        ]
-
-instance ToJSON Alonzo.FailureDescription where
-  toJSON f = case f of
-    Alonzo.PlutusFailure t _bs ->
-      object
-        [ "kind" .= String "FailureDescription"
-        , "error" .= String "PlutusFailure"
-        , "description" .= t
-        -- , "reconstructionDetail" .= bs
-        ]
-
 instance
   ( Ledger.Era ledgerera
   , Show (PredicateFailure (Ledger.EraRule "LEDGERS" ledgerera))