Do not elide eb hash in traces

Author: ch1bo

cabal.project

@@ -101,15 +101,12 @@ constraints:
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/ouroboros-consensus
-  tag: a2e3c598b96efa1e2add0bc7b893a7a007ace606
-  --sha256: sha256-uMImzqUvdDCyuso/fN0BEJuhj1BuT8U1Gafbhz4CBRU=
+  tag: e3ffce853e85d6e5e9ff6c7c078816fea689a5b1
+  --sha256: sha256-tFUNTbyhnaaNv8AFSCSs+pPhQydGgOuhfJMGv3pvE1M=
   subdir:
     ouroboros-consensus
     ouroboros-consensus-cardano
-    ouroboros-consensus-protocol
     ouroboros-consensus-diffusion
-    sop-extras
-    strict-sop-core
 
 -- Points to ouroboros-network/nfrisby/leios-202511-demo
 source-repository-package

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

@@ -37,7 +37,7 @@ import           Network.TypedProtocol.Codec (AnyMessage (AnyMessageAndAgency))
 
 import qualified Data.Bits as Bits
 import qualified Data.Vector as V
-import           LeiosDemoTypes (EbHash (..), LeiosEb, LeiosPoint (..), LeiosTx, leiosEbBytesSize, leiosTxBytesSize, prettyBitmap, prettyEbHash)
+import           LeiosDemoTypes (EbHash (..), LeiosEb, LeiosPoint (..), LeiosTx, leiosEbBytesSize, leiosTxBytesSize, prettyBitmap, prettyEbHash, hashLeiosEb)
 import qualified LeiosDemoOnlyTestFetch as LF
 import qualified LeiosDemoOnlyTestNotify as LN
 
@@ -508,6 +508,7 @@ instance LogFormatting (AnyMessage (LN.LeiosNotify LeiosPoint ())) where
 instance LogFormatting (AnyMessage (LF.LeiosFetch LeiosPoint LeiosEb LeiosTx)) where
   forHuman = showT
 
+  -- FIXME: Duplicated (orphan!) instance with Cardano.Tracing.OrphanInstances.Network
   forMachine _dtal (AnyMessageAndAgency _stok msg) = case msg of
 
     LF.MsgLeiosBlockRequest (MkLeiosPoint ebSlot ebHash) ->
@@ -518,7 +519,7 @@ instance LogFormatting (AnyMessage (LF.LeiosFetch LeiosPoint LeiosEb LeiosTx)) w
 
     LF.MsgLeiosBlock eb ->
       mconcat [ "kind" .= String "MsgLeiosBlock"
-              , "eb" .= String "<elided>"
+              , "eb" .= hashLeiosEb eb
               , "ebBytesSize" .= Number (fromIntegral $ leiosEbBytesSize eb)
               ]
 

cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs

@@ -144,7 +144,7 @@ import qualified Network.TypedProtocol.Stateful.Codec as Stateful
 
 import qualified Data.Bits as Bits
 import qualified Data.Vector as V
-import           LeiosDemoTypes (EbHash (..), LeiosEb, LeiosPoint (..), LeiosTx, leiosEbBytesSize, leiosTxBytesSize, prettyBitmap, prettyEbHash)
+import           LeiosDemoTypes (EbHash (..), LeiosEb, LeiosPoint (..), LeiosTx, leiosEbBytesSize, leiosTxBytesSize, prettyBitmap, prettyEbHash, hashLeiosEb)
 import           LeiosDemoTypes (TraceLeiosKernel, TraceLeiosPeer, traceLeiosKernelToObject, traceLeiosPeerToObject)
 import qualified LeiosDemoOnlyTestFetch as LF
 import qualified LeiosDemoOnlyTestNotify as LN
@@ -2924,6 +2924,7 @@ instance ToObject peer
   trTransformer = trStructured
 
 instance ToObject (AnyMessage (LF.LeiosFetch LeiosPoint LeiosEb LeiosTx)) where
+  -- FIXME: Duplicated (orphan!) instance with Cardano.Node.Tracing.Tracers.NodeToNode
   toObject _verb (AnyMessageAndAgency _stok msg) = case msg of
 
     LF.MsgLeiosBlockRequest (MkLeiosPoint ebSlot ebHash) ->
@@ -2934,7 +2935,7 @@ instance ToObject (AnyMessage (LF.LeiosFetch LeiosPoint LeiosEb LeiosTx)) where
 
     LF.MsgLeiosBlock eb ->
       mconcat [ "kind" .= String "MsgLeiosBlock"
-              , "eb" .= String "<elided>"
+              , "eb" .= hashLeiosEb eb
               , "ebBytesSize" .= Number (fromIntegral $ leiosEbBytesSize eb)
               ]