ouroboros-consensus upgrade: TriggerHardFork changes

cardano-node/src/Cardano/Node/Protocol/Cardano.hs

@@ -31,7 +31,6 @@ import           Cardano.Tracing.OrphanInstances.Byron ()
 import           Cardano.Tracing.OrphanInstances.Shelley ()
 import           Ouroboros.Consensus.Cardano
 import qualified Ouroboros.Consensus.Cardano as Consensus
-import qualified Ouroboros.Consensus.Cardano.CanHardFork as Consensus
 import           Ouroboros.Consensus.Cardano.Condense ()
 import qualified Ouroboros.Consensus.Cardano.Node as Consensus
 import           Ouroboros.Consensus.Config (emptyCheckpointsMap)
@@ -91,17 +90,11 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
                             -- not-yet-ready eras in released node versions without mainnet nodes
                             -- prematurely advertising that they could hard fork into the new era.
                              npcTestShelleyHardForkAtEpoch,
-                             npcTestShelleyHardForkAtVersion,
                              npcTestAllegraHardForkAtEpoch,
-                             npcTestAllegraHardForkAtVersion,
                              npcTestMaryHardForkAtEpoch,
-                             npcTestMaryHardForkAtVersion,
                              npcTestAlonzoHardForkAtEpoch,
-                             npcTestAlonzoHardForkAtVersion,
                              npcTestBabbageHardForkAtEpoch,
-                             npcTestBabbageHardForkAtVersion,
-                             npcTestConwayHardForkAtEpoch,
-                             npcTestConwayHardForkAtVersion
+                             npcTestConwayHardForkAtEpoch
                            }
                            files = do
     byronGenesis <-
@@ -202,37 +195,31 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
                -- But we also provide an override to allow for simpler test setups
                -- such as triggering at the 0 -> 1 transition .
                --
-               Nothing -> Consensus.TriggerHardForkAtVersion
-                            (maybe 2 fromIntegral npcTestShelleyHardForkAtVersion)
+               Nothing -> Consensus.CardanoTriggerHardForkAtDefaultVersion
 
                -- Alternatively, for testing we can transition at a specific epoch.
                --
-               Just epochNo -> Consensus.TriggerHardForkAtEpoch epochNo
+               Just epochNo -> Consensus.CardanoTriggerHardForkAtEpoch epochNo
         , triggerHardForkAllegra =
             case npcTestAllegraHardForkAtEpoch of
-               Nothing -> Consensus.TriggerHardForkAtVersion
-                            (maybe 3 fromIntegral npcTestAllegraHardForkAtVersion)
-               Just epochNo -> Consensus.TriggerHardForkAtEpoch epochNo
+               Nothing -> Consensus.CardanoTriggerHardForkAtDefaultVersion
+               Just epochNo -> Consensus.CardanoTriggerHardForkAtEpoch epochNo
         , triggerHardForkMary =
             case npcTestMaryHardForkAtEpoch of
-               Nothing -> Consensus.TriggerHardForkAtVersion
-                            (maybe 4 fromIntegral npcTestMaryHardForkAtVersion)
-               Just epochNo -> Consensus.TriggerHardForkAtEpoch epochNo
+               Nothing -> Consensus.CardanoTriggerHardForkAtDefaultVersion
+               Just epochNo -> Consensus.CardanoTriggerHardForkAtEpoch epochNo
         , triggerHardForkAlonzo =
             case npcTestAlonzoHardForkAtEpoch of
-               Nothing -> Consensus.TriggerHardForkAtVersion
-                            (maybe 5 fromIntegral npcTestAlonzoHardForkAtVersion)
-               Just epochNo -> Consensus.TriggerHardForkAtEpoch epochNo
+               Nothing -> Consensus.CardanoTriggerHardForkAtDefaultVersion
+               Just epochNo -> Consensus.CardanoTriggerHardForkAtEpoch epochNo
         , triggerHardForkBabbage =
              case npcTestBabbageHardForkAtEpoch of
-                Nothing -> Consensus.TriggerHardForkAtVersion
-                             (maybe 7 fromIntegral npcTestBabbageHardForkAtVersion)
-                Just epochNo -> Consensus.TriggerHardForkAtEpoch epochNo
+                Nothing -> Consensus.CardanoTriggerHardForkAtDefaultVersion
+                Just epochNo -> Consensus.CardanoTriggerHardForkAtEpoch epochNo
         , triggerHardForkConway =
              case npcTestConwayHardForkAtEpoch of
-                Nothing -> Consensus.TriggerHardForkAtVersion
-                             (maybe 9 fromIntegral npcTestConwayHardForkAtVersion)
-                Just epochNo -> Consensus.TriggerHardForkAtEpoch epochNo
+                Nothing -> Consensus.CardanoTriggerHardForkAtDefaultVersion
+                Just epochNo -> Consensus.CardanoTriggerHardForkAtEpoch epochNo
         }
        -- TODO: once https://github.com/IntersectMBO/cardano-node/issues/5730 is implemented 'emptyCheckpointsMap' needs to be replaced with the checkpoints map read from a configuration file.
       , Consensus.cardanoCheckpoints = emptyCheckpointsMap