fixup! ouroboros-network upgrade: support Ouroboros.Network.Driver.St…

…ateful
IntersectMBO · Dec 10, 2024 · bb533d1 · bb533d1
1 parent 41ca0a3
commit bb533d1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
@@ -49,7 +49,7 @@ import qualified Ouroboros.Network.ConnectionManager.Types as ConnMgr
 import           Ouroboros.Network.DeltaQ (GSV (..), PeerGSV (..))
 import qualified Ouroboros.Network.Diffusion as ND
 import           Ouroboros.Network.Driver.Limits (ProtocolLimitFailure (..))
-import qualified Ouroboros.Network.Driver.Stateful as NDS
+import qualified Ouroboros.Network.Driver.Stateful as Stateful
 import           Ouroboros.Network.ExitPolicy (RepromoteDelay (..))
 import qualified Ouroboros.Network.InboundGovernor as InboundGovernor
 import qualified Ouroboros.Network.InboundGovernor.State as InboundGovernor
@@ -175,6 +175,11 @@ instance HasSeverityAnnotation (TraceSendRecv a) where
   getSeverityAnnotation _ = Debug
 
 
+instance HasPrivacyAnnotation (Stateful.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) f)
+instance HasSeverityAnnotation (Stateful.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) f) where
+  getSeverityAnnotation _ = Debug
+
+
 instance HasPrivacyAnnotation a => HasPrivacyAnnotation (TraceLabelPeer peer a)
 instance HasSeverityAnnotation a => HasSeverityAnnotation (TraceLabelPeer peer a) where
   getSeverityAnnotation (TraceLabelPeer _p a) = getSeverityAnnotation a
@@ -660,11 +665,11 @@ instance (LocalStateQuery.ShowQuery (BlockQuery blk), ToObject localPeer)
   trTransformer = trStructured
 
 instance
-  ( HasPrivacyAnnotation (NDS.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) f)
-  , HasSeverityAnnotation (NDS.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) f)
-  , ToObject (NDS.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) f)
+  ( HasPrivacyAnnotation (Stateful.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) f)
+  , HasSeverityAnnotation (Stateful.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) f)
+  , ToObject (Stateful.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) f)
   , ToObject localPeer)
-     => Transformable Text IO (TraceLabelPeer localPeer (NDS.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) f)) where
+     => Transformable Text IO (TraceLabelPeer localPeer (Stateful.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) f)) where
   trTransformer = trStructured
 
 instance (ToObject peer, Show (TxId (GenTx blk)), Show (GenTx blk))

diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs
@@ -69,7 +69,7 @@ import           Ouroboros.Consensus.HeaderValidation (OtherHeaderEnvelopeError)
 import           Ouroboros.Consensus.Ledger.Abstract (LedgerErr, LedgerState)
 import           Ouroboros.Consensus.Ledger.Extended (ledgerState)
 import           Ouroboros.Consensus.Ledger.Inspect (InspectLedger, LedgerEvent)
-import           Ouroboros.Consensus.Ledger.Query (BlockQuery)
+import           Ouroboros.Consensus.Ledger.Query (BlockQuery, Query)
 import           Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr, GenTx, GenTxId, HasTxs,
                    LedgerSupportsMempool, ByteSize32 (..))
 import           Ouroboros.Consensus.Ledger.SupportsProtocol (LedgerSupportsProtocol)
@@ -98,6 +98,7 @@ import           Ouroboros.Network.ConnectionManager.Types (ConnectionManagerCou
 import qualified Ouroboros.Network.Diffusion as Diffusion
 import qualified Ouroboros.Network.Diffusion.NonP2P as NonP2P
 import qualified Ouroboros.Network.Diffusion.P2P as P2P
+import qualified Ouroboros.Network.Driver.Stateful as Stateful
 import qualified Ouroboros.Network.InboundGovernor as InboundGovernor
 import           Ouroboros.Network.InboundGovernor.State as InboundGovernor
 import           Ouroboros.Network.NodeToClient (LocalAddress)
@@ -106,7 +107,7 @@ import           Ouroboros.Network.PeerSelection.Governor (ChurnCounters (..),
                    PeerSelectionCounters, PeerSelectionView (..))
 import qualified Ouroboros.Network.PeerSelection.Governor as Governor
 import           Ouroboros.Network.Point (fromWithOrigin)
-import           Ouroboros.Network.Protocol.LocalStateQuery.Type (ShowQuery)
+import           Ouroboros.Network.Protocol.LocalStateQuery.Type (LocalStateQuery, ShowQuery)
 import           Ouroboros.Network.TxSubmission.Inbound
 
 import           Codec.CBOR.Read (DeserialiseFailure)
@@ -1385,8 +1386,11 @@ forgeStateInfoTracer p _ts tracer = Tracer $ \ev -> do
 --------------------------------------------------------------------------------
 
 nodeToClientTracers'
-  :: ( ToObject localPeer
-     , ShowQuery (BlockQuery blk)
+  :: forall blk localPeer.
+     ( HasPrivacyAnnotation (Stateful.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) LocalStateQuery.State)
+     , HasSeverityAnnotation (Stateful.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) LocalStateQuery.State)
+     , ToObject (Stateful.TraceSendRecv (LocalStateQuery blk (Point blk) (Query blk)) LocalStateQuery.State)
+     , ToObject localPeer
      )
   => TraceSelection
   -> TracingVerbosity