Merge #379

379: Updated ouroboros versions in cabal.project and stack.yaml r=mrBliss a=oneEdoubleD Signed-off-by: oneEdoubleD <[email protected]> Co-authored-by: oneEdoubleD <[email protected]>
IntersectMBO · Dec 6, 2019 · 7772567 · 7772567
2 parents a53ec0f + bd49eb5
commit 7772567
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 27 deletions.
diff --git a/cabal.project b/cabal.project
@@ -151,37 +151,37 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 28d657017913755e3fa5a51a152744c0e6b38be6
+  tag: c785fe64445357b806c847fa438fc7612563b42b
   subdir: ouroboros-network
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 28d657017913755e3fa5a51a152744c0e6b38be6
+  tag: c785fe64445357b806c847fa438fc7612563b42b
   subdir: ouroboros-consensus
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 28d657017913755e3fa5a51a152744c0e6b38be6
+  tag: c785fe64445357b806c847fa438fc7612563b42b
   subdir: typed-protocols
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 28d657017913755e3fa5a51a152744c0e6b38be6
+  tag: c785fe64445357b806c847fa438fc7612563b42b
   subdir: typed-protocols-cbor
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 28d657017913755e3fa5a51a152744c0e6b38be6
+  tag: c785fe64445357b806c847fa438fc7612563b42b
   subdir: network-mux
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 28d657017913755e3fa5a51a152744c0e6b38be6
+  tag: c785fe64445357b806c847fa438fc7612563b42b
   subdir: io-sim-classes
 
 source-repository-package

diff --git a/cardano-node/src/Cardano/Tracing/ToObjectOrphans.hs b/cardano-node/src/Cardano/Tracing/ToObjectOrphans.hs
@@ -313,8 +313,8 @@ instance DefinePrivacyAnnotation (TraceLocalTxSubmissionServerEvent blk)
 instance DefineSeverity (TraceLocalTxSubmissionServerEvent blk) where
   defineSeverity _ = Info
 
-instance DefinePrivacyAnnotation (TraceForgeEvent blk)
-instance DefineSeverity (TraceForgeEvent blk) where
+instance DefinePrivacyAnnotation (TraceForgeEvent blk tx)
+instance DefineSeverity (TraceForgeEvent blk tx) where
   defineSeverity (TraceForgeEvent {})           = Info
   defineSeverity (TraceCouldNotForge {})        = Warning
   defineSeverity (TraceAdoptedBlock {})         = Info
@@ -357,7 +357,7 @@ instance Transformable Text IO (TraceTxSubmissionOutbound
 instance Transformable Text IO (TraceLocalTxSubmissionServerEvent blk) where
   trTransformer _ verb tr = trStructured verb tr
 
-instance (Show blk, ProtocolLedgerView blk) => Transformable Text IO (TraceForgeEvent blk) where
+instance (Show blk, Show tx, ProtocolLedgerView blk) => Transformable Text IO (TraceForgeEvent blk tx) where
   trTransformer StructuredLogging verb tr = trStructured verb tr
   trTransformer TextualRepresentation _verb tr = Tracer $ \s ->
     traceWith tr =<< LogObject <$> pure mempty
@@ -835,7 +835,7 @@ instance ToObject (TraceLocalTxSubmissionServerEvent blk) where
   toObject _verb _ =
     mkObject [ "kind" .= String "TraceLocalTxSubmissionServerEvent" ]
 
-instance ProtocolLedgerView blk => ToObject (TraceForgeEvent blk) where
+instance ProtocolLedgerView blk => ToObject (TraceForgeEvent blk tx) where
   toObject _verb (TraceForgeEvent slotNo _) =
     mkObject
         [ "kind"    .= String "TraceForgeEvent"
@@ -847,7 +847,7 @@ instance ProtocolLedgerView blk => ToObject (TraceForgeEvent blk) where
         , "slot"    .= toJSON (unSlotNo slotNo)
         , "reason"  .= show anachronyFailure
         ]
-  toObject _verb (TraceAdoptedBlock slotNo _) =
+  toObject _verb (TraceAdoptedBlock slotNo _blk _txs _time) =
     mkObject
         [ "kind"    .= String "TraceAdoptedBlock"
         , "slot"    .= toJSON (unSlotNo slotNo)

diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs
@@ -200,9 +200,9 @@ mkTracers traceOptions tracer = Tracers
     mempoolTraceTransformer tr = Tracer $ \mempoolEvent -> do
         let tr' = appendName "metrics" tr
             (n, tot) = case mempoolEvent of
-                  TraceMempoolAddTxs      txs0 tot0 -> (length txs0, tot0)
-                  TraceMempoolRejectedTxs txs0 tot0 -> (length txs0, tot0)
-                  TraceMempoolRemoveTxs   txs0 tot0 -> (length txs0, tot0)
+                  TraceMempoolAddTxs      txs0 tot0 _ -> (length txs0, tot0)
+                  TraceMempoolRejectedTxs txs0 tot0 _ -> (length txs0, tot0)
+                  TraceMempoolRemoveTxs   txs0 tot0  _-> (length txs0, tot0)
                   TraceMempoolManuallyRemovedTxs txs0 txs1 tot0
                                                     -> ( length txs0 + length txs1
                                                        , tot0

diff --git a/nix/.stack.nix/io-sim-classes.nix b/nix/.stack.nix/io-sim-classes.nix
diff --git a/nix/.stack.nix/network-mux.nix b/nix/.stack.nix/network-mux.nix
diff --git a/nix/.stack.nix/ouroboros-consensus.nix b/nix/.stack.nix/ouroboros-consensus.nix
diff --git a/nix/.stack.nix/ouroboros-network.nix b/nix/.stack.nix/ouroboros-network.nix
diff --git a/nix/.stack.nix/typed-protocols-cbor.nix b/nix/.stack.nix/typed-protocols-cbor.nix
diff --git a/nix/.stack.nix/typed-protocols.nix b/nix/.stack.nix/typed-protocols.nix
diff --git a/stack.yaml b/stack.yaml
@@ -94,7 +94,7 @@ extra-deps:
     #Ouroboros-network dependencies
 
   - git: https://github.com/input-output-hk/ouroboros-network
-    commit: 28d657017913755e3fa5a51a152744c0e6b38be6
+    commit: c785fe64445357b806c847fa438fc7612563b42b
     subdirs:
         - io-sim-classes
         - network-mux