Rename ShelleyBasedBlock to IsShelleyBlock.

Author: dnadales

ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs

@@ -112,7 +112,7 @@ import qualified Ouroboros.Consensus.Protocol.TPraos as Shelley
 import           Ouroboros.Consensus.Shelley.HFEras ()
 import           Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock)
 import qualified Ouroboros.Consensus.Shelley.Ledger as Shelley
-import           Ouroboros.Consensus.Shelley.Ledger.Block (ShelleyBasedBlock,
+import           Ouroboros.Consensus.Shelley.Ledger.Block (IsShelleyBlock,
                      ShelleyBlockLedgerEra)
 import           Ouroboros.Consensus.Shelley.Ledger.NetworkProtocolVersion
 import           Ouroboros.Consensus.Shelley.Node
@@ -978,7 +978,7 @@ protocolInfoCardano paramsCardano
 
         registerAny :: NP (LedgerState -.-> LedgerState) (CardanoShelleyEras c)
         registerAny =
-            hcmap (Proxy @ShelleyBasedBlock) injectIntoTestState $
+            hcmap (Proxy @IsShelleyBlock) injectIntoTestState $
                 WrapTransitionConfig transitionConfigShelley
              :* WrapTransitionConfig transitionConfigAllegra
              :* WrapTransitionConfig transitionConfigMary

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Block.hs

@@ -17,8 +17,8 @@
 module Ouroboros.Consensus.Shelley.Ledger.Block (
     GetHeader (..)
   , Header (..)
+  , IsShelleyBlock
   , NestedCtxt_ (..)
-  , ShelleyBasedBlock
   , ShelleyBasedEra
   , ShelleyBlock (..)
   , ShelleyBlockLedgerEra
@@ -144,11 +144,11 @@ mkShelleyBlock raw = ShelleyBlock {
 class
   ( ShelleyCompatible (BlockProtocol blk) (ShelleyBlockLedgerEra blk)
   , blk ~ ShelleyBlock (BlockProtocol blk) (ShelleyBlockLedgerEra blk)
-  ) => ShelleyBasedBlock blk
+  ) => IsShelleyBlock blk
 
 instance ( proto ~ BlockProtocol (ShelleyBlock proto era)
          , ShelleyCompatible proto era
-         ) => ShelleyBasedBlock (ShelleyBlock proto era)
+         ) => IsShelleyBlock (ShelleyBlock proto era)
 
 type family ShelleyBlockLedgerEra blk where
   ShelleyBlockLedgerEra (ShelleyBlock proto era) = era

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Block/Cardano.hs

@@ -76,7 +76,7 @@ import           Ouroboros.Consensus.Node.ProtocolInfo
 import           Ouroboros.Consensus.Protocol.Praos.Translate ()
 import           Ouroboros.Consensus.Shelley.HFEras ()
 import qualified Ouroboros.Consensus.Shelley.Ledger as Shelley.Ledger
-import           Ouroboros.Consensus.Shelley.Ledger.Block (ShelleyBasedBlock,
+import           Ouroboros.Consensus.Shelley.Ledger.Block (IsShelleyBlock,
                      ShelleyBlock, ShelleyBlockLedgerEra)
 import           Ouroboros.Consensus.Shelley.Ledger.SupportsProtocol ()
 import           System.Directory (makeAbsolute)
@@ -236,15 +236,15 @@ instance Aeson.FromJSON CardanoConfig where
 
     triggers <- do
       let parseTrigger ::
-               forall blk era. (ShelleyBasedBlock blk, ShelleyBlockLedgerEra blk ~ era)
+               forall blk era. (IsShelleyBlock blk, ShelleyBlockLedgerEra blk ~ era)
             => (Aeson.Parser :.: K TriggerHardFork) blk
           parseTrigger = Comp $ fmap K $
                         (fmap TriggerHardForkAtEpoch <$> (v Aeson..:? nm))
               Aeson..!= TriggerHardForkAtVersion (getVersion (L.eraProtVerLow @era))
             where
               nm = fromString $ "Test" <> L.eraName @era <> "HardForkAtEpoch"
 
-      triggers <- hsequence' $ hcpure (Proxy @ShelleyBasedBlock) parseTrigger
+      triggers <- hsequence' $ hcpure (Proxy @IsShelleyBlock) parseTrigger
 
       let isBad :: NP (K TriggerHardFork) xs -> Bool
           isBad = \case