Updated cardano-node

IntersectMBO · May 9, 2022 · 0822e9b · 0822e9b
1 parent 493bf5f
commit 0822e9b
Show file tree

Hide file tree

Showing 8 changed files with 374 additions and 488 deletions.
diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -174,6 +174,7 @@ library
                       , psqueues
                       , safe-exceptions
                       , scientific
+                      , singletons
                       , strict-stm
                       , cardano-ledger-shelley
                       , small-steps

diff --git a/cardano-node/src/Cardano/Node/TraceConstraints.hs b/cardano-node/src/Cardano/Node/TraceConstraints.hs
@@ -4,6 +4,7 @@
 module Cardano.Node.TraceConstraints (TraceConstraints) where
 
 
+import           Prelude (Show)
 import           Data.Aeson
 
 import           Cardano.BM.Tracing (ToObject)
@@ -31,6 +32,8 @@ type TraceConstraints blk =
     , HasKESMetricsData blk
     , HasKESInfo blk
     , GetKESInfo blk
+    , Show blk
+    , Show (Header blk)
 
     , ToObject (ApplyTxErr blk)
     , ToObject (GenTx blk)

diff --git a/cardano-node/src/Cardano/Node/Tracing/Documentation.hs b/cardano-node/src/Cardano/Node/Tracing/Documentation.hs
@@ -48,6 +48,7 @@ import           Cardano.Node.Startup
 import           Cardano.Node.TraceConstraints
 
 import           Ouroboros.Consensus.Block.Forging
+import           Ouroboros.Consensus.Block.NestedContent (HasNestedContent)
 import           Ouroboros.Consensus.BlockchainTime.WallClock.Types (RelativeTime)
 import           Ouroboros.Consensus.BlockchainTime.WallClock.Util (TraceBlockchainTimeEvent (..))
 import           Ouroboros.Consensus.Cardano.Block
@@ -172,6 +173,7 @@ docTracers :: forall blk peer remotePeer.
   , Show (ForgeStateUpdateError blk)
   , Show (CannotForge blk)
   , ShowQuery (BlockQuery blk)
+  , HasNestedContent Header blk
   )
   => FilePath
   -> FilePath

diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Diffusion.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Diffusion.hs
@@ -37,7 +37,7 @@ import           Data.Aeson (Value (String), (.=))
 import           Data.Text (pack)
 import           Network.Mux (MuxTrace (..), WithMuxBearer (..))
 import qualified Network.Socket as Socket
-import           Network.TypedProtocol.Codec (AnyMessageAndAgency (..))
+import           Network.TypedProtocol.Codec (AnyMessage (..))
 import           Text.Show
 
 import           Cardano.Node.Configuration.TopologyP2P (UseLedger (..))
@@ -74,6 +74,8 @@ severityMux' MuxTraceChannelRecvStart {}      = Debug
 severityMux' MuxTraceChannelRecvEnd {}        = Debug
 severityMux' MuxTraceChannelSendStart {}      = Debug
 severityMux' MuxTraceChannelSendEnd {}        = Debug
+severityMux' MuxTraceChannelTryRecvStart {}   = Debug
+severityMux' MuxTraceChannelTryRecvEnd {}     = Debug
 severityMux' MuxTraceHandshakeStart           = Debug
 severityMux' MuxTraceHandshakeClientEnd {}    = Info
 severityMux' MuxTraceHandshakeServerEnd       = Debug
@@ -107,6 +109,8 @@ namesForMux' MuxTraceChannelRecvStart {}      = ["ChannelRecvStart"]
 namesForMux' MuxTraceChannelRecvEnd {}        = ["ChannelRecvEnd"]
 namesForMux' MuxTraceChannelSendStart {}      = ["ChannelSendStart"]
 namesForMux' MuxTraceChannelSendEnd {}        = ["ChannelSendEnd"]
+namesForMux' MuxTraceChannelTryRecvStart {}   = ["ChannelTryRecvStart"]
+namesForMux' MuxTraceChannelTryRecvEnd {}     = ["ChannelTryRecvEnd"]
 namesForMux' MuxTraceHandshakeStart           = ["HandshakeStart "]
 namesForMux' MuxTraceHandshakeClientEnd {}    = ["HandshakeClientEnd"]
 namesForMux' MuxTraceHandshakeServerEnd       = ["HandshakeServerEnd"]
@@ -271,8 +275,8 @@ severityHandshake' ::
 severityHandshake' (TraceSendMsg m) = severityHandshake'' m
 severityHandshake' (TraceRecvMsg m) = severityHandshake'' m
 
-severityHandshake'' :: AnyMessageAndAgency (HS.Handshake nt CBOR.Term) -> SeverityS
-severityHandshake'' (AnyMessageAndAgency _agency msg) = severityHandshake''' msg
+severityHandshake'' :: AnyMessage (HS.Handshake nt CBOR.Term) -> SeverityS
+severityHandshake'' (AnyMessage msg) = severityHandshake''' msg
 
 severityHandshake''' :: Message (HS.Handshake nt CBOR.Term) from to -> SeverityS
 severityHandshake''' HS.MsgProposeVersions {} = Info
@@ -289,8 +293,8 @@ namesForHandshake' ::
 namesForHandshake' (TraceSendMsg m) = "Send" : namesForHandshake'' m
 namesForHandshake' (TraceRecvMsg m) = "Recieve" : namesForHandshake'' m
 
-namesForHandshake'' :: AnyMessageAndAgency (HS.Handshake nt CBOR.Term) -> [Text]
-namesForHandshake'' (AnyMessageAndAgency _agency msg) = namesForHandshake''' msg
+namesForHandshake'' :: AnyMessage (HS.Handshake nt CBOR.Term) -> [Text]
+namesForHandshake'' (AnyMessage msg) = namesForHandshake''' msg
 
 namesForHandshake''' :: Message (HS.Handshake nt CBOR.Term) from to -> [Text]
 namesForHandshake''' HS.MsgProposeVersions {} = ["ProposeVersions"]
@@ -348,8 +352,8 @@ severityLocalHandshake' ::
 severityLocalHandshake' (TraceSendMsg m) = severityLocalHandshake'' m
 severityLocalHandshake' (TraceRecvMsg m) = severityLocalHandshake'' m
 
-severityLocalHandshake'' :: AnyMessageAndAgency (HS.Handshake nt CBOR.Term) -> SeverityS
-severityLocalHandshake'' (AnyMessageAndAgency _agency msg) = severityLocalHandshake''' msg
+severityLocalHandshake'' :: AnyMessage (HS.Handshake nt CBOR.Term) -> SeverityS
+severityLocalHandshake'' (AnyMessage msg) = severityLocalHandshake''' msg
 
 severityLocalHandshake''' :: Message (HS.Handshake nt CBOR.Term) from to -> SeverityS
 severityLocalHandshake''' HS.MsgProposeVersions {} = Info
@@ -366,8 +370,8 @@ namesForLocalHandshake' ::
 namesForLocalHandshake' (TraceSendMsg m) = "Send" : namesForLocalHandshake'' m
 namesForLocalHandshake' (TraceRecvMsg m) = "Receive" : namesForLocalHandshake'' m
 
-namesForLocalHandshake'' :: AnyMessageAndAgency (HS.Handshake nt CBOR.Term) -> [Text]
-namesForLocalHandshake'' (AnyMessageAndAgency _agency msg) = namesForLocalHandshake''' msg
+namesForLocalHandshake'' :: AnyMessage (HS.Handshake nt CBOR.Term) -> [Text]
+namesForLocalHandshake'' (AnyMessage msg) = namesForLocalHandshake''' msg
 
 namesForLocalHandshake''' :: Message (HS.Handshake nt CBOR.Term) from to -> [Text]
 namesForLocalHandshake''' HS.MsgProposeVersions {} = ["ProposeVersions"]