Skip to content

Commit

Permalink
NodeToNodeVersion update
Browse files Browse the repository at this point in the history
* Remove support for NodeToNodeV_12 and older
* Add support for NodeToNodeV_14 to track adoption rate
  of Chang +1 HF
  • Loading branch information
crocodile-dentist committed Oct 11, 2024
1 parent 7956efa commit f4ea333
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
7 changes: 1 addition & 6 deletions cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs
Original file line number Diff line number Diff line change
Expand Up @@ -443,13 +443,8 @@ nodeToClientVersionToInt = \case

nodeToNodeVersionToInt :: NodeToNodeVersion -> Int
nodeToNodeVersionToInt = \case
NodeToNodeV_7 -> 7
NodeToNodeV_8 -> 8
NodeToNodeV_9 -> 9
NodeToNodeV_10 -> 10
NodeToNodeV_11 -> 11
NodeToNodeV_12 -> 12
NodeToNodeV_13 -> 13
NodeToNodeV_14 -> 14

-- | Pretty print 'StartupInfoTrace'
--
Expand Down
14 changes: 2 additions & 12 deletions cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2169,22 +2169,12 @@ instance Show vNumber => ToJSON (HandshakeException vNumber) where
]

instance ToJSON NodeToNodeVersion where
toJSON NodeToNodeV_7 = Number 7
toJSON NodeToNodeV_8 = Number 8
toJSON NodeToNodeV_9 = Number 9
toJSON NodeToNodeV_10 = Number 10
toJSON NodeToNodeV_11 = Number 11
toJSON NodeToNodeV_12 = Number 12
toJSON NodeToNodeV_13 = Number 13
toJSON NodeToNodeV_14 = Number 14

instance FromJSON NodeToNodeVersion where
parseJSON (Number 7) = return NodeToNodeV_7
parseJSON (Number 8) = return NodeToNodeV_8
parseJSON (Number 9) = return NodeToNodeV_9
parseJSON (Number 10) = return NodeToNodeV_10
parseJSON (Number 11) = return NodeToNodeV_11
parseJSON (Number 12) = return NodeToNodeV_12
parseJSON (Number 13) = return NodeToNodeV_13
parseJSON (Number 14) = return NodeToNodeV_14
parseJSON (Number x) = fail ("FromJSON.NodeToNodeVersion: unsupported node-to-node protocol version " ++ show x)
parseJSON x = fail ("FromJSON.NodeToNodeVersion: error parsing NodeToNodeVersion: " ++ show x)

Expand Down

0 comments on commit f4ea333

Please sign in to comment.