Skip to content

Commit b84e0ec

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.
1 parent 5fad777 commit b84e0ec

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ allow-newer:
5959
source-repository-package
6060
type: git
6161
location: https://github.com/IntersectMBO/ouroboros-network
62-
tag: 8dfff7b8916f7a56b2a3773438d5e5530c780710
62+
tag: peras-staging/pr-5202
6363
--sha256: sha256-wMDq19G1SW4+puuQUUjgaULSou4+r7wJj6evnWoW/Xk=
6464
subdir:
6565
ouroboros-network

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

Lines changed: 12 additions & 2 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,6 +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)
58+
import Data.Set (Set)
5759
import Data.Void (Void)
5860
import qualified Network.Mux as Mux
5961
import Network.TypedProtocol.Codec
@@ -994,13 +996,15 @@ mkApps kernel rng Tracers{..} mkCodecs ByteLimits{..} chainSyncTimeouts lopBucke
994996
-- on the protocol version, but it eventually may; this is why @_version@ is
995997
-- currently unused.
996998
initiator ::
999+
Set CardanoFeatureFlag ->
9971000
MiniProtocolParameters ->
9981001
NodeToNodeVersion ->
9991002
NodeToNodeVersionData ->
10001003
Apps m addr b b b b b b a c ->
10011004
OuroborosBundleWithExpandedCtx 'Mux.InitiatorMode addr b m a Void
1002-
initiator miniProtocolParameters version versionData Apps{..} =
1005+
initiator featureFlags miniProtocolParameters version versionData Apps{..} =
10031006
nodeToNodeProtocols
1007+
featureFlags
10041008
miniProtocolParameters
10051009
-- TODO: currently consensus is using 'ConnectionId' for its 'peer' type.
10061010
-- This is currently ok, as we might accept multiple connections from the
@@ -1017,6 +1021,8 @@ initiator miniProtocolParameters version versionData Apps{..} =
10171021
(InitiatorProtocolOnly (MiniProtocolCb (\ctx -> aTxSubmission2Client version ctx)))
10181022
, perasCertDiffusionProtocol =
10191023
(InitiatorProtocolOnly (MiniProtocolCb (\ctx -> aPerasCertDiffusionClient version ctx)))
1024+
, perasVoteDiffusionProtocol =
1025+
error "perasVoteDiffusionProtocol: not implemented"
10201026
, keepAliveProtocol =
10211027
(InitiatorProtocolOnly (MiniProtocolCb (\ctx -> aKeepAliveClient version ctx)))
10221028
, peerSharingProtocol =
@@ -1032,13 +1038,15 @@ initiator miniProtocolParameters version versionData Apps{..} =
10321038
-- on the protocol version, but it eventually may; this is why @_version@ is
10331039
-- currently unused.
10341040
initiatorAndResponder ::
1041+
Set CardanoFeatureFlag ->
10351042
MiniProtocolParameters ->
10361043
NodeToNodeVersion ->
10371044
NodeToNodeVersionData ->
10381045
Apps m addr b b b b b b a c ->
10391046
OuroborosBundleWithExpandedCtx 'Mux.InitiatorResponderMode addr b m a c
1040-
initiatorAndResponder miniProtocolParameters version versionData Apps{..} =
1047+
initiatorAndResponder featureFlags miniProtocolParameters version versionData Apps{..} =
10411048
nodeToNodeProtocols
1049+
featureFlags
10421050
miniProtocolParameters
10431051
( NodeToNodeProtocols
10441052
{ chainSyncProtocol =
@@ -1061,6 +1069,8 @@ initiatorAndResponder miniProtocolParameters version versionData Apps{..} =
10611069
(MiniProtocolCb (\initiatorCtx -> aPerasCertDiffusionClient version initiatorCtx))
10621070
(MiniProtocolCb (\responderCtx -> aPerasCertDiffusionServer version responderCtx))
10631071
)
1072+
, perasVoteDiffusionProtocol =
1073+
error "perasVoteDiffusionProtocol: not implemented"
10641074
, keepAliveProtocol =
10651075
( InitiatorAndResponderProtocol
10661076
(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
@@ -740,7 +740,7 @@ runWith RunNodeArgs{..} encAddrNtN decAddrNtN LowLevelRunNodeArgs{..} =
740740
version
741741
llrnVersionDataNTN
742742
( \versionData ->
743-
NTN.initiator miniProtocolParams version versionData
743+
NTN.initiator llrnFeatureFlags miniProtocolParams version versionData
744744
-- Initiator side won't start responder side of Peer
745745
-- Sharing protocol so we give a dummy implementation
746746
-- here.
@@ -755,7 +755,7 @@ runWith RunNodeArgs{..} encAddrNtN decAddrNtN LowLevelRunNodeArgs{..} =
755755
version
756756
llrnVersionDataNTN
757757
( \versionData ->
758-
NTN.initiatorAndResponder miniProtocolParams version versionData $
758+
NTN.initiatorAndResponder llrnFeatureFlags miniProtocolParams version versionData $
759759
ntnApps blockVersion
760760
)
761761
| (version, blockVersion) <- Map.toList llrnNodeToNodeVersions

0 commit comments

Comments
 (0)