Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
newhoggy committed Jul 19, 2022
1 parent 87b514c commit a2089c1
Show file tree
Hide file tree
Showing 5 changed files with 1,482 additions and 21 deletions.
12 changes: 6 additions & 6 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 65292694de72f137e6b90c5f361ae7646b48775f
--sha256: 05m1c7v8a2797675gkagpzl6bcjnj7w6lnx5x7hf90847ap88b05
tag: f49879a79098d9372d63baa13b94a941a56eda34
--sha256: 0i9x66yqkrvx2w79dy6lzlya82yxc8567rgjj828vc2d46d6nvx6
subdir:
eras/alonzo/impl
eras/alonzo/test-suite
Expand Down Expand Up @@ -227,8 +227,8 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: c7fc9fba236972c27a55e0f3d34c2758cf616bfc
--sha256: 0sg1hhnifqxfc5n5f9ikbxyrjlg77hynbhsql0h4smqniw29dbwk
tag: 6ea36cf2247ac0bc33e08c327abec34dfd05bd99
--sha256: 0z2y3wzppc12bpn9bl48776ms3nszw8j58xfsdxf97nzjgrmd62g
subdir:
cardano-prelude
cardano-prelude-test
Expand Down Expand Up @@ -263,8 +263,8 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 69b748ea07ffbaf9c7868645f9f8ca9b58f658b5
--sha256: 0yfici9p5gbj7gzpbk19izwsksagzc8fjls3cax291128jyvpi7w
tag: c764553561bed8978d2c6753d1608dc65449617a
--sha256: 0hdh7xdrvxw943r6qr0xr4kwszindh5mnsn1lww6qdnxnmn7wcsc
subdir:
monoidal-synchronisation
network-mux
Expand Down
4 changes: 2 additions & 2 deletions cardano-node/src/Cardano/Node/Tracing/Documentation.hs
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ docTracers configFileName outputFileName _ _ _ = do
allPublic
configureTracers trConfig docDebugPeerSelection [debugPeerSelectionTr]
debugPeerSelectionTrDoc <- documentTracer trConfig debugPeerSelectionTr
(docDebugPeerSelection :: Documented (DebugPeerSelection Socket.SockAddr peer))
(docDebugPeerSelection :: Documented (DebugPeerSelection Socket.SockAddr))

debugPeerSelectionResponderTr <- mkCardanoTracer
trBase trForward mbTrEKG
Expand All @@ -690,7 +690,7 @@ docTracers configFileName outputFileName _ _ _ = do
allPublic
configureTracers trConfig docDebugPeerSelection [debugPeerSelectionResponderTr]
debugPeerSelectionResponderTrDoc <- documentTracer trConfig debugPeerSelectionResponderTr
(docDebugPeerSelection :: Documented (DebugPeerSelection Socket.SockAddr peer))
(docDebugPeerSelection :: Documented (DebugPeerSelection Socket.SockAddr))

peerSelectionCountersTr <- mkCardanoTracer
trBase trForward mbTrEKG
Expand Down
14 changes: 7 additions & 7 deletions cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs
Original file line number Diff line number Diff line change
Expand Up @@ -591,13 +591,13 @@ peerSelectionTargetsToObject
-- DebugPeerSelection Tracer
--------------------------------------------------------------------------------

namesForDebugPeerSelection :: DebugPeerSelection SockAddr peerConn -> [Text]
namesForDebugPeerSelection :: DebugPeerSelection SockAddr -> [Text]
namesForDebugPeerSelection _ = ["GovernorState"]

severityDebugPeerSelection :: DebugPeerSelection SockAddr peerConn -> SeverityS
severityDebugPeerSelection :: DebugPeerSelection SockAddr -> SeverityS
severityDebugPeerSelection _ = Debug

instance Show peerConn => LogFormatting (DebugPeerSelection SockAddr peerConn) where
instance LogFormatting (DebugPeerSelection SockAddr) where
forMachine DNormal (TraceGovernorState blockedAt wakeupAfter
PeerSelectionState { targets, knownPeers, establishedPeers, activePeers }) =
mconcat [ "kind" .= String "DebugPeerSelection"
Expand All @@ -618,7 +618,7 @@ instance Show peerConn => LogFormatting (DebugPeerSelection SockAddr peerConn) w
]
forHuman = pack . show

docDebugPeerSelection :: Documented (DebugPeerSelection SockAddr peerConn)
docDebugPeerSelection :: Documented (DebugPeerSelection SockAddr)
docDebugPeerSelection = Documented
[ DocMsg
["GovernorState"]
Expand Down Expand Up @@ -1502,14 +1502,14 @@ docInboundGovernor isLocal = Documented
""
, DocMsg
["InboundGovernorCounters"]
(if isLocal
(if isLocal
then
[("Net.LocalInboundGovernor.Idle","")
,("Net.LocalInboundGovernor.Cold","")
,("Net.LocalInboundGovernor.Warm","")
,("Net.LocalInboundGovernor.Hot","")
]
else
]
else
[("Net.InboundGovernor.Idle","")
,("Net.InboundGovernor.Cold","")
,("Net.InboundGovernor.Warm","")
Expand Down
11 changes: 5 additions & 6 deletions cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,8 @@ instance HasSeverityAnnotation (TracePeerSelection addr) where
TraceChurnWait {} -> Info
TraceChurnMode {} -> Info

instance HasPrivacyAnnotation (DebugPeerSelection addr conn)
instance HasSeverityAnnotation (DebugPeerSelection addr conn) where
instance HasPrivacyAnnotation (DebugPeerSelection addr)
instance HasSeverityAnnotation (DebugPeerSelection addr) where
getSeverityAnnotation _ = Debug

instance HasPrivacyAnnotation (PeerSelectionActionsTrace SockAddr)
Expand Down Expand Up @@ -664,10 +664,9 @@ instance Transformable Text IO (TracePeerSelection SockAddr) where
instance HasTextFormatter (TracePeerSelection SockAddr) where
formatText a _ = pack (show a)

instance Show conn
=> Transformable Text IO (DebugPeerSelection SockAddr conn) where
instance Transformable Text IO (DebugPeerSelection SockAddr) where
trTransformer = trStructuredText
instance HasTextFormatter (DebugPeerSelection SockAddr conn) where
instance HasTextFormatter (DebugPeerSelection SockAddr) where
-- One can only change what is logged with respect to verbosity using json
-- format.
formatText _ obj = pack (show obj)
Expand Down Expand Up @@ -1619,7 +1618,7 @@ peerSelectionTargetsToObject
, "active" .= targetNumberOfActivePeers
]

instance Show peerConn => ToObject (DebugPeerSelection SockAddr peerConn) where
instance ToObject (DebugPeerSelection SockAddr) where
toObject verb (TraceGovernorState blockedAt wakeupAfter
PeerSelectionState { targets, knownPeers, establishedPeers, activePeers })
| verb <= NormalVerbosity =
Expand Down
1,462 changes: 1,462 additions & 0 deletions releases.json

Large diffs are not rendered by default.

0 comments on commit a2089c1

Please sign in to comment.