use CardanoNodeToClientVersion15 instead of creating a new version

cabal.project

@@ -52,5 +52,5 @@ source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
   -- branch: fraser-iohk/one-era-gen-tx-id-protocol-version-bump
-  tag: 5bbd1696304d82968c3055dfcf2380ee66bb56a0
+  tag: bece46c328752ec2c75e5739cbfd04d0dc8d863a
   subdir: ouroboros-network-api

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

@@ -49,7 +49,6 @@ module Ouroboros.Consensus.Cardano.Node (
   , pattern CardanoNodeToClientVersion13
   , pattern CardanoNodeToClientVersion14
   , pattern CardanoNodeToClientVersion15
-  , pattern CardanoNodeToClientVersion16
   , pattern CardanoNodeToClientVersion2
   , pattern CardanoNodeToClientVersion3
   , pattern CardanoNodeToClientVersion4
@@ -516,13 +515,13 @@ pattern CardanoNodeToClientVersion14 =
       :* Nil
       )
 
--- | The hard fork enabled, and the Shelley, Allegra, Mary, Alonzo and Babbage
--- and Conway eras enabled, using 'ShelleyNodeToClientVersion11' for the
--- Shelley-based eras.
+-- | The hard fork enabled, using 'HardForkSpecificNodeToClientVersion4', and
+-- the Shelley, Allegra, Mary, Alonzo and Babbage and Conway eras enabled,
+-- using 'ShelleyNodeToClientVersion11' for the Shelley-based eras.
 pattern CardanoNodeToClientVersion15 :: BlockNodeToClientVersion (CardanoBlock c)
 pattern CardanoNodeToClientVersion15 =
     HardForkNodeToClientEnabled
-      HardForkSpecificNodeToClientVersion3
+      HardForkSpecificNodeToClientVersion4
       (  EraNodeToClientEnabled ByronNodeToClientVersion1
       :* EraNodeToClientEnabled ShelleyNodeToClientVersion11
       :* EraNodeToClientEnabled ShelleyNodeToClientVersion11
@@ -533,20 +532,6 @@ pattern CardanoNodeToClientVersion15 =
       :* Nil
       )
 
-pattern CardanoNodeToClientVersion16 :: BlockNodeToClientVersion (CardanoBlock c)
-pattern CardanoNodeToClientVersion16 =
-    HardForkNodeToClientEnabled
-      HardForkSpecificNodeToClientVersion4
-      (  EraNodeToClientEnabled ByronNodeToClientVersion1
-      :* EraNodeToClientEnabled ShelleyNodeToClientVersion10
-      :* EraNodeToClientEnabled ShelleyNodeToClientVersion10
-      :* EraNodeToClientEnabled ShelleyNodeToClientVersion10
-      :* EraNodeToClientEnabled ShelleyNodeToClientVersion10
-      :* EraNodeToClientEnabled ShelleyNodeToClientVersion10
-      :* EraNodeToClientEnabled ShelleyNodeToClientVersion10
-      :* Nil
-      )
-
 instance CardanoHardForkConstraints c
       => SupportedNetworkProtocolVersion (CardanoBlock c) where
   supportedNodeToNodeVersions _ = Map.fromList $

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

@@ -71,7 +71,6 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where
       , (NodeToClientV_17, ShelleyNodeToClientVersion9)
       , (NodeToClientV_18, ShelleyNodeToClientVersion10)
       , (NodeToClientV_19, ShelleyNodeToClientVersion11)
-      , (NodeToClientV_20, ShelleyNodeToClientVersion11)
       ]
 
   latestReleasedNodeVersion = latestReleasedNodeVersionDefault

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs

@@ -48,5 +48,4 @@ instance CardanoHardForkConstraints c
     CardanoNodeToClientVersion13 -> "CardanoNodeToClientVersion13"
     CardanoNodeToClientVersion14 -> "CardanoNodeToClientVersion14"
     CardanoNodeToClientVersion15 -> "CardanoNodeToClientVersion15"
-    CardanoNodeToClientVersion16 -> "CardanoNodeToClientVersion16"
     _                            -> error $ "Unknown version: " <> show blockVersion

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs

@@ -31,4 +31,3 @@ nodeToClientVersionToQueryVersion x = case x of
   NodeToClientV_17 -> QueryVersion2
   NodeToClientV_18 -> QueryVersion2
   NodeToClientV_19 -> QueryVersion2
-  NodeToClientV_20 -> QueryVersion2