Update ouroboros-network dependency

IntersectMBO · Aug 19, 2022 · 19e060e · 19e060e
1 parent a47a954
commit 19e060e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 21 deletions.
diff --git a/cabal.project b/cabal.project
@@ -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

diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs
@@ -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
@@ -961,7 +961,7 @@ 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"
       , "context" .= show e

diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
@@ -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
@@ -1770,7 +1769,7 @@ 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"
       , "context" .= show e

diff --git a/flake.nix b/flake.nix
@@ -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;
@@ -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, ... }: {

diff --git a/nix/workbench/membench-overlay.nix b/nix/workbench/membench-overlay.nix
@@ -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;

diff --git a/nix/workbench/shell.nix b/nix/workbench/shell.nix
@@ -88,12 +88,12 @@ in project.shellFor {
   nativeBuildInputs = with pkgs; with haskellPackages; with cardanoNodePackages; [
     cardano-ping
     cabalWrapped
-    db-analyser
     ghcid
     haskellBuildUtils
     pkgs.graphviz
     weeder
     nixWrapped
+    ouroboros-consensus-cardano-tools
     pkgconfig
     profiteur
     profiterole