Merge pull request #240 from input-output-hk/newhoggy/featuresInEra-i…

…nstances

Remove duplicate instances and add new `FeatureInEra ShelleyBasedEra` instance

cardano-cli/cardano-cli.cabal

@@ -190,7 +190,6 @@ library
                       , cardano-ledger-shelley >=1.4.1.0
                       , cardano-ping ^>= 0.2.0.5
                       , cardano-prelude
-                      , cardano-protocol-tpraos >= 1.0
                       , cardano-slotting ^>= 0.1
                       , cardano-strict-containers ^>= 0.1
                       , cborg >= 0.2.4 && < 0.3

cardano-cli/src/Cardano/CLI/Orphans.hs

@@ -1,83 +1,23 @@
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 module Cardano.CLI.Orphans () where
 
-import qualified Cardano.Ledger.Crypto as CC (Crypto)
-import qualified Cardano.Protocol.TPraos.API as Ledger
-import           Cardano.Protocol.TPraos.BHeader (HashHeader (..))
-import qualified Cardano.Protocol.TPraos.Rules.Prtcl as Ledger
-import qualified Cardano.Protocol.TPraos.Rules.Tickn as Ledger
-import           Ouroboros.Consensus.Byron.Ledger.Block (ByronHash (..))
-import           Ouroboros.Consensus.HardFork.Combinator (OneEraHash (..))
-import           Ouroboros.Consensus.Protocol.Praos (PraosState)
-import qualified Ouroboros.Consensus.Protocol.Praos as Consensus
-import           Ouroboros.Consensus.Protocol.TPraos (TPraosState)
-import qualified Ouroboros.Consensus.Protocol.TPraos as Consensus
-import           Ouroboros.Consensus.Shelley.Eras (StandardCrypto)
-import           Ouroboros.Consensus.Shelley.Ledger.Block (ShelleyHash (..))
-import           Ouroboros.Network.Block (HeaderHash, Tip (..))
-
-import           Data.Aeson (KeyValue ((.=)), ToJSON (..))
-import qualified Data.Aeson as Aeson
-import qualified Data.ByteString.Base16 as Base16
-import qualified Data.ByteString.Short as SBS
-import qualified Data.Text.Encoding as Text
-
-instance ToJSON (OneEraHash xs) where
-  toJSON = toJSON
-         . Text.decodeLatin1
-         . Base16.encode
-         . SBS.fromShort
-         . getOneEraHash
-
-deriving newtype instance ToJSON ByronHash
-
--- This instance is temporarily duplicated in cardano-config
-
-instance ToJSON (HeaderHash blk) => ToJSON (Tip blk) where
-  toJSON TipGenesis = Aeson.object [ "genesis" .= True ]
-  toJSON (Tip slotNo headerHash blockNo) =
-    Aeson.object
-      [ "slotNo"     .= slotNo
-      , "headerHash" .= headerHash
-      , "blockNo"    .= blockNo
-      ]
-
---
--- Simple newtype wrappers JSON conversion
---
-
-deriving newtype instance CC.Crypto crypto => ToJSON (ShelleyHash crypto)
-deriving newtype instance CC.Crypto crypto => ToJSON (HashHeader crypto)
-
-deriving instance ToJSON (Ledger.PrtclState StandardCrypto)
-deriving instance ToJSON Ledger.TicknState
-deriving instance ToJSON (Ledger.ChainDepState StandardCrypto)
-
-instance ToJSON (TPraosState StandardCrypto) where
-  toJSON s = Aeson.object
-    [ "lastSlot" .= Consensus.tpraosStateLastSlot s
-    , "chainDepState" .= Consensus.tpraosStateChainDepState s
-    ]
-
-instance ToJSON (PraosState StandardCrypto) where
-  toJSON s = Aeson.object
-    [ "lastSlot" .= Consensus.praosStateLastSlot s
-    , "oCertCounters" .= Consensus.praosStateOCertCounters s
-    , "evolvingNonce" .= Consensus.praosStateEvolvingNonce s
-    , "candidateNonce" .= Consensus.praosStateCandidateNonce s
-    , "epochNonce" .= Consensus.praosStateEpochNonce s
-    , "labNonce" .= Consensus.praosStateLabNonce s
-    , "lastEpochBlockNonce" .= Consensus.praosStateLastEpochBlockNonce s
-    ]
+import           Cardano.Api (CardanoEra (..), FeatureInEra (..), ShelleyBasedEra (..))
+
+instance FeatureInEra ShelleyBasedEra where
+  featureInEra no yes = \case
+    ByronEra    -> no
+    ShelleyEra  -> yes ShelleyBasedEraShelley
+    AllegraEra  -> yes ShelleyBasedEraAllegra
+    MaryEra     -> yes ShelleyBasedEraMary
+    AlonzoEra   -> yes ShelleyBasedEraAlonzo
+    BabbageEra  -> yes ShelleyBasedEraBabbage
+    ConwayEra   -> yes ShelleyBasedEraConway