Skip to content

Commit 61b943c

Browse files
tbagrel1agustinmistaamesgengeo2anbacquey
committed
Change s-r-p for ouroboros-network to add ObjectDiffusion support
Also use defaultMiniProtocolParameters instead of hardcoded value in unstable-diffusion-testlib to account for newly defined parameters in the new `ouroboros-network` version. Also integrate `NodeToNodeV_16`. Co-authored-by: Agustin Mista <agustin.mista@moduscreate.com> Co-authored-by: Alexander Esgen <alexander.esgen@iohk.io> Co-authored-by: Georgy Lukyanov <georgy.lukyanov@iohk.io> Co-authored-by: Thomas BAGREL <thomas.bagrel@tweag.io> Co-authored-by: Nicolas BACQUEY <nicolas.bacquey@tweag.io> Co-authored-by: Nicolas "Niols" Jeannerod <nicolas.jeannerod@moduscreate.com>
1 parent d7c3c64 commit 61b943c

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

cabal.project

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ allow-newer:
5959
source-repository-package
6060
type: git
6161
location: https://github.com/IntersectMBO/ouroboros-network
62-
tag: b07a86ed853b63881b5a83e57508902f1562ac01
63-
--sha256: sha256-n/XX0+cQegq2a1cAfmGx30T64eix4oEXzpVEFCKqmg0=
62+
tag: 8dfff7b8916f7a56b2a3773438d5e5530c780710
63+
--sha256: sha256-wMDq19G1SW4+puuQUUjgaULSou4+r7wJj6evnWoW/Xk=
6464
subdir:
65+
ouroboros-network
66+
ouroboros-network-protocols
6567
ouroboros-network-api
6668
ouroboros-network

ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ instance
430430
Map.fromList $
431431
[ (NodeToNodeV_14, CardanoNodeToNodeVersion2)
432432
, (NodeToNodeV_15, CardanoNodeToNodeVersion2)
433+
, (NodeToNodeV_16, CardanoNodeToNodeVersion2)
433434
]
434435

435436
supportedNodeToClientVersions _ =

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where
4848
Map.fromList
4949
[ (NodeToNodeV_14, ShelleyNodeToNodeVersion1)
5050
, (NodeToNodeV_15, ShelleyNodeToNodeVersion1)
51+
, (NodeToNodeV_16, ShelleyNodeToNodeVersion1)
5152
]
5253
supportedNodeToClientVersions _ =
5354
Map.fromList

ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Network.hs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ import Ouroboros.Network.NodeToNode
123123
( ConnectionId (..)
124124
, ExpandedInitiatorContext (..)
125125
, IsBigLedgerPeer (..)
126-
, MiniProtocolParameters (..)
127126
, ResponderContext (..)
127+
, defaultMiniProtocolParameters
128128
)
129129
import Ouroboros.Network.PeerSelection.Governor
130130
( makePublicPeerSelectionStateVar
@@ -1056,13 +1056,7 @@ runThreadNetwork
10561056
, mempoolCapacityOverride = NoMempoolCapacityBytesOverride
10571057
, keepAliveRng = kaRng
10581058
, peerSharingRng = psRng
1059-
, miniProtocolParameters =
1060-
MiniProtocolParameters
1061-
{ chainSyncPipeliningHighMark = 4
1062-
, chainSyncPipeliningLowMark = 2
1063-
, blockFetchPipeliningMax = 10
1064-
, txSubmissionMaxUnacked = 1000 -- TODO ?
1065-
}
1059+
, miniProtocolParameters = defaultMiniProtocolParameters
10661060
, blockFetchConfiguration =
10671061
BlockFetchConfiguration
10681062
{ bfcMaxConcurrencyBulkSync = 1

0 commit comments

Comments
 (0)