TSLCP: Chain density

Author: fmaste

cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs

@@ -1470,7 +1470,7 @@ instance LogFormatting TraceStartLeadershipCheckPlus where
                 , "slot" .= toJSON (unSlotNo tsSlotNo)
                 , "utxoSize" .= Number (fromIntegral tsUtxoSize)
                 , "delegMapSize" .= Number (fromIntegral tsDelegMapSize)
-                , "chainDensity" .= Number (fromRational (toRational tsChainDensity))
+                , "chainDensity" .= (toJSON tsChainDensity)
                 ]
   forHuman TraceStartLeadershipCheckPlus {..} =
       "Checking for leadership in slot " <> showT (unSlotNo tsSlotNo)

cardano-node/src/Cardano/Node/Tracing/Tracers/StartLeadershipCheck.hs

@@ -76,7 +76,7 @@ forgeTracerTransform nodeKern (Trace tr) =
                                 slotNo
                                 utxoSize
                                 delegMapSize
-                                (fromRational chainDensity)
+                                chainDensity
                     in pure (lc, Right (Right msg))
           (lc, Right a) ->
               pure (lc, Right a)
@@ -97,12 +97,12 @@ fragmentChainDensity ::
 #else
   AF.HasHeader (Header blk)
 #endif
-  => AF.AnchoredFragment (Header blk) -> Rational
+  => AF.AnchoredFragment (Header blk) -> Double
 fragmentChainDensity frag = calcDensity blockD slotD
   where
-    calcDensity :: Word64 -> Word64 -> Rational
+    calcDensity :: Word64 -> Word64 -> Double
     calcDensity bl sl
-      | sl > 0 = toRational bl / toRational sl
+      | sl > 0 = fromIntegral bl / fromIntegral sl
       | otherwise = 0
     slotN  = unSlotNo $ fromWithOrigin 0 (AF.headSlot frag)
     -- Slot of the tip - slot @k@ blocks back. Use 0 as the slot for genesis

cardano-node/src/Cardano/Tracing/Tracers.hs

@@ -645,7 +645,7 @@ traceChainMetrics (Just _ekgDirect) tForks _blockConfig _fStats tr = do
       -- TODO this is executed each time the newChain changes. How cheap is it?
       meta <- mkLOMeta Critical Public
 
-      traceD tr meta "density"     (fromRational density)
+      traceD tr meta "density"     density
       traceI tr meta "slotNum"     slots
       traceI tr meta "blockNum"    blocks
       traceI tr meta "slotInEpoch" slotInEpoch
@@ -1082,7 +1082,7 @@ traceLeadershipChecks _ft nodeKern _tverb tr = Tracer $
                  \(utxoSize, delegMapSize, chainDensity) ->
                    [ ("utxoSize",     toJSON utxoSize)
                    , ("delegMapSize", toJSON delegMapSize)
-                   , ("chainDensity", toJSON (fromRational chainDensity :: Float))
+                   , ("chainDensity", toJSON chainDensity)
                    ])
           )
       _ -> pure ()
@@ -1693,7 +1693,7 @@ traceInboundGovernorCountersMetrics (OnOff True) (Just ekgDirect) = ipgcTracer
 data ChainInformation = ChainInformation
   { slots :: Word64
   , blocks :: Word64
-  , density :: Rational
+  , density :: Double
     -- ^ the actual number of blocks created over the maximum expected number
     -- of blocks that could be created over the span of the last @k@ blocks.
   , epoch :: EpochNo
@@ -1749,12 +1749,12 @@ chainInformation selChangedInfo fork oldFrag frag blocksUncoupledDelta = ChainIn
 
 fragmentChainDensity ::
   HasHeader (Header blk)
-  => AF.AnchoredFragment (Header blk) -> Rational
+  => AF.AnchoredFragment (Header blk) -> Double
 fragmentChainDensity frag = calcDensity blockD slotD
   where
-    calcDensity :: Word64 -> Word64 -> Rational
+    calcDensity :: Word64 -> Word64 -> Double
     calcDensity bl sl
-      | sl > 0 = toRational bl / toRational sl
+      | sl > 0 = fromIntegral bl / fromIntegral sl
       | otherwise = 0
     slotN  = unSlotNo $ fromWithOrigin 0 (AF.headSlot frag)
     -- Slot of the tip - slot @k@ blocks back. Use 0 as the slot for genesis