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

Bump dependencies #181

Closed
wants to merge 1 commit into from
Closed

Bump dependencies #181

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
18 changes: 9 additions & 9 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions cardano-node/src/Cardano/CLI/Tx/Submission.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
2 changes: 2 additions & 0 deletions cardano-node/src/Cardano/Chairman.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 13 additions & 11 deletions cardano-node/src/Cardano/Tracing/Tracers.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions cardano-node/src/Cardano/Wallet/Client.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions nix/.stack.nix/cardano-shell.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nix/.stack.nix/contra-tracer.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nix/.stack.nix/io-sim-classes.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nix/.stack.nix/iohk-monitoring.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nix/.stack.nix/network-mux.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nix/.stack.nix/ouroboros-consensus.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nix/.stack.nix/ouroboros-network.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nix/.stack.nix/typed-protocols-cbor.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nix/.stack.nix/typed-protocols.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down