integration work

IntersectMBO · May 31, 2023 · e6a5043 · e6a5043
1 parent 43f9303
commit e6a5043
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs
@@ -92,7 +92,6 @@ instance (  LogFormatting (Header blk)
   forHuman (ChainDB.TraceLedgerReplayEvent v)      = forHuman v
   forHuman (ChainDB.TraceImmutableDBEvent v)       = forHuman v
   forHuman (ChainDB.TraceVolatileDBEvent v)        = forHuman v
-  forHuman (ChainDB.TraceLedgerEvent v)            = forHuman v
 
   forMachine details (ChainDB.TraceAddBlockEvent v) =
     forMachine details v
@@ -116,8 +115,6 @@ instance (  LogFormatting (Header blk)
     forMachine details v
   forMachine details (ChainDB.TraceVolatileDBEvent v) =
     forMachine details v
-  forMachine details (ChainDB.TraceLedgerEvent v) =
-    forMachine details v
 
   asMetrics (ChainDB.TraceAddBlockEvent v)          = asMetrics v
   asMetrics (ChainDB.TraceFollowerEvent v)          = asMetrics v
@@ -130,7 +127,6 @@ instance (  LogFormatting (Header blk)
   asMetrics (ChainDB.TraceLedgerReplayEvent v)      = asMetrics v
   asMetrics (ChainDB.TraceImmutableDBEvent v)       = asMetrics v
   asMetrics (ChainDB.TraceVolatileDBEvent v)        = asMetrics v
-  asMetrics (ChainDB.TraceLedgerEvent v)            = asMetrics v
 
 
 instance MetaTrace  (ChainDB.TraceEvent blk) where
@@ -156,8 +152,6 @@ instance MetaTrace  (ChainDB.TraceEvent blk) where
     nsPrependInner "ImmDbEvent" (namespaceFor ev)
   namespaceFor (ChainDB.TraceVolatileDBEvent ev) =
      nsPrependInner "VolatileDbEvent" (namespaceFor ev)
-  namespaceFor (ChainDB.TraceLedgerEvent ev) =
-     nsPrependInner "TraceLedgerEvent" (namespaceFor ev)
 
   severityFor (Namespace out ("AddBlockEvent" : tl)) (Just (ChainDB.TraceAddBlockEvent ev')) =
     severityFor (Namespace out tl) (Just ev')

diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs
@@ -406,6 +406,7 @@ nodeToClientVersionToInt = \case
   NodeToClientV_13 -> 13
   NodeToClientV_14 -> 14
   NodeToClientV_15 -> 15
+  NodeToClientV_16 -> 16
 
 nodeToNodeVersionToInt :: NodeToNodeVersion -> Int
 nodeToNodeVersionToInt = \case
@@ -414,6 +415,7 @@ nodeToNodeVersionToInt = \case
   NodeToNodeV_9 -> 9
   NodeToNodeV_10 -> 10
   NodeToNodeV_11 -> 11
+  NodeToNodeV_12 -> 12
 
 -- | Pretty print 'StartupInfoTrace'
 --

diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs
@@ -120,7 +120,6 @@ instance ConvertRawHash blk => ConvertRawHash (Header blk) where
 
 instance HasPrivacyAnnotation (ChainDB.TraceEvent blk)
 instance HasSeverityAnnotation (ChainDB.TraceEvent blk) where
-  getSeverityAnnotation (ChainDB.TraceLedgerEvent _ev) = Debug
   getSeverityAnnotation (ChainDB.TraceAddBlockEvent ev) = case ev of
     ChainDB.IgnoreBlockOlderThanK {} -> Info
     ChainDB.IgnoreBlockAlreadyInVolatileDB {} -> Info
@@ -466,7 +465,6 @@ instance ( ConvertRawHash blk
          , InspectLedger blk)
       => HasTextFormatter (ChainDB.TraceEvent blk) where
     formatText tev _obj = case tev of
-      ChainDB.TraceLedgerEvent _ev -> "TraceLedgerEvent"
       ChainDB.TraceAddBlockEvent ev -> case ev of
         ChainDB.IgnoreBlockOlderThanK pt ->
           "Ignoring block older than K: " <> renderRealPointAsPhrase pt
@@ -971,9 +969,6 @@ instance ( ConvertRawHash blk
      chainLengthΔ :: AF.AnchoredFragment (Header blk) -> AF.AnchoredFragment (Header blk) -> Int
      chainLengthΔ = on (-) (fromWithOrigin (-1) . fmap (fromIntegral . unBlockNo) . AF.headBlockNo)
 
-  toObject _verb (ChainDB.TraceLedgerEvent _ev) =
-      mconcat [ "kind" .= String "TraceLedgerEvent" ]
-
   toObject MinimalVerbosity (ChainDB.TraceLedgerReplayEvent _ev) = mempty -- no output
   toObject verb (ChainDB.TraceLedgerReplayEvent ev) = case ev of
     LedgerDB.ReplayFromGenesis _replayTo ->

diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
@@ -1776,6 +1776,7 @@ instance ToJSON NodeToNodeVersion where
   toJSON NodeToNodeV_9  = Number 9
   toJSON NodeToNodeV_10 = Number 10
   toJSON NodeToNodeV_11  = Number 11
+  toJSON NodeToNodeV_12  = Number 12
 
 instance FromJSON NodeToNodeVersion where
   parseJSON (Number 7) = return NodeToNodeV_7
@@ -1794,6 +1795,7 @@ instance ToJSON NodeToClientVersion where
   toJSON NodeToClientV_13 = Number 13
   toJSON NodeToClientV_14 = Number 14
   toJSON NodeToClientV_15 = Number 15
+  toJSON NodeToClientV_16 = Number 16
 
 instance FromJSON NodeToClientVersion where
   parseJSON (Number 9) = return NodeToClientV_9