Skip to content

Commit 49c4729

Browse files
committed
Bump ouroboros-network to match peras-staging/pr-5202
Bumps the external ouroboros-network source-repository-package to the updated peras-staging/pr-5202, which incorporates the changes from: IntersectMBO/ouroboros-network#5202 In addition, it tweak call sites of `nodeToNodeProtocols` to match its updated signature, passing down the enabled feature flags. Conflicts: cabal.project ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs
1 parent 381611a commit 49c4729

File tree

2 files changed

+14
-9
lines changed
  • ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus

2 files changed

+14
-9
lines changed

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ module Ouroboros.Consensus.Network.NodeToNode
3939
, initiatorAndResponder
4040
) where
4141

42+
import Cardano.Base.FeatureFlags (CardanoFeatureFlag)
4243
import Codec.CBOR.Decoding (Decoder)
4344
import qualified Codec.CBOR.Decoding as CBOR
4445
import Codec.CBOR.Encoding (Encoding)
@@ -54,7 +55,7 @@ import qualified Data.ByteString.Lazy as BSL
5455
import Data.Hashable (Hashable)
5556
import Data.Int (Int64)
5657
import Data.Map.Strict (Map)
57-
import qualified Data.Set as Set
58+
import Data.Set (Set)
5859
import Data.Void (Void)
5960
import qualified Network.Mux as Mux
6061
import Network.TypedProtocol.Codec
@@ -1002,14 +1003,15 @@ mkApps kernel rng Tracers{..} mkCodecs ByteLimits{..} chainSyncTimeouts lopBucke
10021003
-- on the protocol version, but it eventually may; this is why @_version@ is
10031004
-- currently unused.
10041005
initiator ::
1006+
Set CardanoFeatureFlag ->
10051007
MiniProtocolParameters ->
10061008
NodeToNodeVersion ->
10071009
NodeToNodeVersionData ->
10081010
Apps m addr b b b b b b a c ->
10091011
OuroborosBundleWithExpandedCtx 'Mux.InitiatorMode addr b m a Void
1010-
initiator miniProtocolParameters version versionData Apps{..} =
1012+
initiator featureFlags miniProtocolParameters version versionData Apps{..} =
10111013
nodeToNodeProtocols
1012-
Set.empty -- TODO: change for a meaningful value
1014+
featureFlags
10131015
miniProtocolParameters
10141016
-- TODO: currently consensus is using 'ConnectionId' for its 'peer' type.
10151017
-- This is currently ok, as we might accept multiple connections from the
@@ -1026,7 +1028,8 @@ initiator miniProtocolParameters version versionData Apps{..} =
10261028
(InitiatorProtocolOnly (MiniProtocolCb (\ctx -> aTxSubmission2Client version ctx)))
10271029
, perasCertDiffusionProtocol =
10281030
(InitiatorProtocolOnly (MiniProtocolCb (\ctx -> aPerasCertDiffusionClient version ctx)))
1029-
, perasVoteDiffusionProtocol = error "perasVoteDiffusionProtocol not implemented"
1031+
, perasVoteDiffusionProtocol =
1032+
error "perasVoteDiffusionProtocol not implemented"
10301033
, keepAliveProtocol =
10311034
(InitiatorProtocolOnly (MiniProtocolCb (\ctx -> aKeepAliveClient version ctx)))
10321035
, peerSharingProtocol =
@@ -1042,14 +1045,15 @@ initiator miniProtocolParameters version versionData Apps{..} =
10421045
-- on the protocol version, but it eventually may; this is why @_version@ is
10431046
-- currently unused.
10441047
initiatorAndResponder ::
1048+
Set CardanoFeatureFlag ->
10451049
MiniProtocolParameters ->
10461050
NodeToNodeVersion ->
10471051
NodeToNodeVersionData ->
10481052
Apps m addr b b b b b b a c ->
10491053
OuroborosBundleWithExpandedCtx 'Mux.InitiatorResponderMode addr b m a c
1050-
initiatorAndResponder miniProtocolParameters version versionData Apps{..} =
1054+
initiatorAndResponder featureFlags miniProtocolParameters version versionData Apps{..} =
10511055
nodeToNodeProtocols
1052-
Set.empty -- TODO: change for a meaningful value
1056+
featureFlags
10531057
miniProtocolParameters
10541058
( NodeToNodeProtocols
10551059
{ chainSyncProtocol =
@@ -1072,7 +1076,8 @@ initiatorAndResponder miniProtocolParameters version versionData Apps{..} =
10721076
(MiniProtocolCb (\initiatorCtx -> aPerasCertDiffusionClient version initiatorCtx))
10731077
(MiniProtocolCb (\responderCtx -> aPerasCertDiffusionServer version responderCtx))
10741078
)
1075-
, perasVoteDiffusionProtocol = error "perasVoteDiffusionProtocol not implemented"
1079+
, perasVoteDiffusionProtocol =
1080+
error "perasVoteDiffusionProtocol not implemented"
10761081
, keepAliveProtocol =
10771082
( InitiatorAndResponderProtocol
10781083
(MiniProtocolCb (\initiatorCtx -> aKeepAliveClient version initiatorCtx))

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ runWith RunNodeArgs{..} encAddrNtN decAddrNtN LowLevelRunNodeArgs{..} =
741741
version
742742
llrnVersionDataNTN
743743
( \versionData ->
744-
NTN.initiator miniProtocolParams version versionData
744+
NTN.initiator llrnFeatureFlags miniProtocolParams version versionData
745745
-- Initiator side won't start responder side of Peer
746746
-- Sharing protocol so we give a dummy implementation
747747
-- here.
@@ -756,7 +756,7 @@ runWith RunNodeArgs{..} encAddrNtN decAddrNtN LowLevelRunNodeArgs{..} =
756756
version
757757
llrnVersionDataNTN
758758
( \versionData ->
759-
NTN.initiatorAndResponder miniProtocolParams version versionData $
759+
NTN.initiatorAndResponder llrnFeatureFlags miniProtocolParams version versionData $
760760
ntnApps blockVersion
761761
)
762762
| (version, blockVersion) <- Map.toList llrnNodeToNodeVersions

0 commit comments

Comments
 (0)