Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ouroboros-network dependency #4359

Closed
wants to merge 1 commit into from
Closed

Update ouroboros-network dependency #4359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,15 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: c764553561bed8978d2c6753d1608dc65449617a
--sha256: 0hdh7xdrvxw943r6qr0xr4kwszindh5mnsn1lww6qdnxnmn7wcsc
tag: 15b56d1fe5b94d8fa5d80d85a84a18eb3b22e513
--sha256: 165r3xzf1gzhp22iv1407n0xlbjsla45jhiyqcnbybng8s79513q
subdir:
monoidal-synchronisation
network-mux
ouroboros-consensus
ouroboros-consensus-byron
ouroboros-consensus-cardano
ouroboros-consensus-cardano-tools
ouroboros-consensus-protocol
ouroboros-consensus-shelley
ouroboros-network
Expand Down
14 changes: 7 additions & 7 deletions cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,11 +765,11 @@ severityConnectionManager TrTerminatingConnection {} = Debug
severityConnectionManager TrTerminatedConnection {} = Debug
severityConnectionManager (TrConnectionHandler _ ev') =
case ev' of
TrHandshakeSuccess {} -> Info
TrHandshakeClientError {} -> Notice
TrHandshakeServerError {} -> Info
TrError _ _ ShutdownNode -> Critical
TrError _ _ ShutdownPeer -> Info
TrHandshakeSuccess {} -> Info
TrHandshakeClientError {} -> Notice
TrHandshakeServerError {} -> Info
TrConnectionHandlerError _ _ ShutdownNode -> Critical
TrConnectionHandlerError _ _ ShutdownPeer -> Info

severityConnectionManager TrShutdown = Info
severityConnectionManager TrConnectionExists {} = Info
Expand Down Expand Up @@ -961,9 +961,9 @@ instance (Show versionNumber, ToJSON versionNumber, ToJSON agreedOptions)
[ "kind" .= String "HandshakeServerError"
, "reason" .= toJSON err
]
forMachine _dtal (TrError e err cerr) =
forMachine _dtal (TrConnectionHandlerError e err cerr) =
mconcat
[ "kind" .= String "Error"
[ "kind" .= String "ConnectionHandlerError"
, "context" .= show e
, "reason" .= show err
, "command" .= show cerr
Expand Down
15 changes: 7 additions & 8 deletions cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,12 +438,11 @@ instance HasSeverityAnnotation (ConnectionManagerTrace addr (ConnectionHandlerTr
TrTerminatedConnection {} -> Debug
TrConnectionHandler _ ev' ->
case ev' of
TrHandshakeSuccess {} -> Info
TrHandshakeClientError {} -> Notice
TrHandshakeServerError {} -> Info
TrError _ _ ShutdownNode -> Critical
TrError _ _ ShutdownPeer -> Info

TrHandshakeSuccess {} -> Info
TrHandshakeClientError {} -> Notice
TrHandshakeServerError {} -> Info
TrConnectionHandlerError _ _ ShutdownNode -> Critical
TrConnectionHandlerError _ _ ShutdownPeer -> Info
TrShutdown -> Info
TrConnectionExists {} -> Info
TrForbiddenConnection {} -> Info
Expand Down Expand Up @@ -1770,9 +1769,9 @@ instance (Show versionNumber, ToJSON versionNumber, ToJSON agreedOptions)
[ "kind" .= String "HandshakeServerError"
, "reason" .= toJSON err
]
toObject _verb (TrError e err cerr) =
toObject _verb (TrConnectionHandlerError e err cerr) =
mconcat
[ "kind" .= String "Error"
[ "kind" .= String "ConnectionHandlerError"
, "context" .= show e
, "reason" .= show err
, "command" .= show cerr
Expand Down
4 changes: 0 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@
inherit pinned-workbench;
projectExes = flatten (haskellLib.collectComponents' "exes" projectPackages) // (with hsPkgsWithPassthru; {
inherit (ouroboros-consensus-byron.components.exes) db-converter;
inherit (ouroboros-consensus-cardano.components.exes) db-analyser;
inherit (bech32.components.exes) bech32;
} // lib.optionalAttrs hostPlatform.isUnix {
inherit (network-mux.components.exes) cardano-ping;
Expand Down Expand Up @@ -434,9 +433,6 @@
cardanoNodeProject = flake.project.${final.system};
cardanoNodePackages = mkCardanoNodePackages final.cardanoNodeProject;
inherit (final.cardanoNodePackages) cardano-node cardano-cli cardano-submit-api bech32 plutus-example;

# TODO, fix this
#db-analyser = ouroboros-network-snapshot.haskellPackages.ouroboros-consensus-cardano.components.exes.db-analyser;
};
nixosModules = {
cardano-node = { pkgs, lib, ... }: {
Expand Down
2 changes: 1 addition & 1 deletion nix/workbench/membench-overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ in
mainnet-chain = cardano-mainnet-mirror.defaultPackage.${self.system};

# TODO, fix this
#db-analyser = ouroboros-network-snapshot.haskellPackages.ouroboros-consensus-cardano.components.exes.db-analyser;
#db-analyser = ouroboros-network-snapshot.haskellPackages.ouroboros-consensus-cardano-tools.components.exes.db-analyser;

## 1. Ledger snapshot
inherit node-snapshot;
Expand Down