Skip to content
Permalink
Browse files

Bump dependencies

  • Loading branch information...
Jimbo4350 committed Sep 11, 2019
1 parent a250fba commit 417ed77192d2745d230b312fdc0b11d362f32fc5
@@ -69,7 +69,7 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-shell
tag: 6d74f0f6675ed0b20166f9e162545309ba72944c
tag: 5ef0ab914031db561d75dbc1cfc74969a7fcd049

source-repository-package
type: git
@@ -80,48 +80,48 @@ source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
subdir: iohk-monitoring
tag: c85d57a95d919336afea7e0eff00e834bd6b4b58
tag: e22be186e0b1018260ed7c5166871f82a869b94d

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
subdir: contra-tracer
tag: c85d57a95d919336afea7e0eff00e834bd6b4b58
tag: e22be186e0b1018260ed7c5166871f82a869b94d

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 05a62acdd64405e284d54a94d55cda832855a84e
tag: 7ebe200d16cf18da8c586bdb64d2ca121ab9d37e
subdir: ouroboros-network

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 05a62acdd64405e284d54a94d55cda832855a84e
tag: 7ebe200d16cf18da8c586bdb64d2ca121ab9d37e
subdir: ouroboros-consensus

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 05a62acdd64405e284d54a94d55cda832855a84e
tag: 7ebe200d16cf18da8c586bdb64d2ca121ab9d37e
subdir: typed-protocols

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 05a62acdd64405e284d54a94d55cda832855a84e
tag: 7ebe200d16cf18da8c586bdb64d2ca121ab9d37e
subdir: typed-protocols-cbor

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 05a62acdd64405e284d54a94d55cda832855a84e
tag: 7ebe200d16cf18da8c586bdb64d2ca121ab9d37e
subdir: network-mux

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 05a62acdd64405e284d54a94d55cda832855a84e
tag: 7ebe200d16cf18da8c586bdb64d2ca121ab9d37e
subdir: io-sim-classes

source-repository-package
@@ -185,3 +185,5 @@ localChainSyncCodec pInfoConfig =
(nodeDecodeBlock pInfoConfig)
(Block.encodePoint (nodeEncodeHeaderHash (Proxy @blk)))
(Block.decodePoint (nodeDecodeHeaderHash (Proxy @blk)))
(Block.encodePoint (nodeEncodeHeaderHash (Proxy @blk)))
(Block.decodePoint (nodeDecodeHeaderHash (Proxy @blk)))
@@ -432,6 +432,8 @@ localChainSyncCodec pInfoConfig =
(nodeDecodeBlock pInfoConfig)
(Block.encodePoint (nodeEncodeHeaderHash (Proxy @blk)))
(Block.decodePoint (nodeDecodeHeaderHash (Proxy @blk)))
(Block.encodePoint (nodeEncodeHeaderHash (Proxy @blk)))
(Block.decodePoint (nodeDecodeHeaderHash (Proxy @blk)))


-- | Local unix socket file path over which the client communicates with a core
@@ -1,12 +1,13 @@
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE UndecidableInstances #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE UndecidableInstances #-}

{-# OPTIONS_GHC -fno-warn-orphans #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
{-# OPTIONS_GHC -Wno-all-missed-specialisations #-}

module Cardano.Tracing.Tracers
@@ -111,7 +112,7 @@ data TraceOptions = TraceOptions
, traceDnsResolver :: !Bool
}

type ConsensusTraceOptions = Consensus.Tracers' () () (Const Bool)
type ConsensusTraceOptions = Consensus.Tracers' () () () (Const Bool)
type ProtocolTraceOptions = ProtocolTracers' () () () (Const Bool)

nullTracers :: Tracers peer blk
@@ -124,7 +125,7 @@ nullTracers = Tracers {
dnsResolverTracer = nullTracer
}
where
nullConsensusTracers :: Consensus.Tracers' peer blk (Tracer IO)
nullConsensusTracers :: Consensus.Tracers' peer blk tip (Tracer IO)
nullConsensusTracers = Consensus.Tracers {
Consensus.chainSyncClientTracer = nullTracer,
Consensus.chainSyncServerTracer = nullTracer,
@@ -148,10 +149,11 @@ nullTracers = Tracers {

-- | Smart constructor of 'NodeTraces'.
--
mkTracers :: forall peer blk.
mkTracers :: forall peer blk tip.
( ProtocolLedgerView blk
, TraceConstraints blk
, Show peer
, tip ~ Point (Header blk)
)
=> TraceOptions
-> Tracer IO (LogObject Text)
@@ -209,7 +211,7 @@ mkTracers traceOptions tracer = Tracers
then showTracing
else const nullTracer

mkConsensusTracers :: Consensus.Tracers' peer blk (Tracer IO)
mkConsensusTracers :: Consensus.Tracers' peer blk tip (Tracer IO)
mkConsensusTracers = Consensus.Tracers
{ Consensus.chainSyncClientTracer
= enableConsensusTracer Consensus.chainSyncClientTracer
@@ -212,6 +212,8 @@ localChainSyncCodec pInfoConfig =
(nodeDecodeBlock pInfoConfig)
(Block.encodePoint (nodeEncodeHeaderHash (Proxy @blk)))
(Block.decodePoint (nodeDecodeHeaderHash (Proxy @blk)))
(Block.encodePoint (nodeEncodeHeaderHash (Proxy @blk)))
(Block.decodePoint (nodeDecodeHeaderHash (Proxy @blk)))


-- | Local unix socket file path over which the client communicates with a core

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

@@ -33,7 +33,7 @@ extra-deps:

# Following deps are for cardano-shell
- git: https://github.com/input-output-hk/cardano-shell
commit: 6d74f0f6675ed0b20166f9e162545309ba72944c
commit: 5ef0ab914031db561d75dbc1cfc74969a7fcd049

- binary-0.8.7.0
- containers-0.5.11.0
@@ -46,7 +46,7 @@ extra-deps:
- tasty-hedgehog-1.0.0.1
# iohk-monitoring-framework currently not pinned to a release
- git: https://github.com/input-output-hk/iohk-monitoring-framework
commit: c85d57a95d919336afea7e0eff00e834bd6b4b58
commit: e22be186e0b1018260ed7c5166871f82a869b94d
subdirs:
- contra-tracer
- iohk-monitoring
@@ -61,7 +61,7 @@ extra-deps:
#Ouroboros-network dependencies

- git: https://github.com/input-output-hk/ouroboros-network
commit: 05a62acdd64405e284d54a94d55cda832855a84e
commit: 7ebe200d16cf18da8c586bdb64d2ca121ab9d37e
subdirs:
- io-sim-classes
- network-mux

0 comments on commit 417ed77

Please sign in to comment.
You can’t perform that action at this time.