Skip to content

Integrate ouroboros-network #1314

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

Merged
merged 8 commits into from
Jan 8, 2025
Merged

Integrate ouroboros-network #1314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7c9a4f
ouroboros-network upgrade: drop NodeToClient versions < 16
neilmayhew Nov 19, 2024
85a7d42
ouroboros-network upgrade: use the new namespace for Network.Mux types
neilmayhew Nov 20, 2024
786cc96
ouroboros-network upgrade: remove field that was discontinued in Bloc…
neilmayhew Dec 13, 2024
24d93a2
Use ouroboros-network-0.19 from CHaP
coot Jan 2, 2025
6ff2992
Update flake.lock
jasagredo Jan 3, 2025
24c18d9
Add missing changelog entries
jasagredo Jan 3, 2025
4d8d4f3
Implement code-review suggestions
jasagredo Jan 3, 2025
9de140c
Bump CHaP index and flake input
neilmayhew Jan 4, 2025
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
Next Next commit
ouroboros-network upgrade: drop NodeToClient versions < 16
  • Loading branch information
@neilmayhew @amesgen
neilmayhew authored and amesgen committed Jan 8, 2025
commit c7c9a4fce6b7c14685730720b5d0fdc26c1f52c1
9 changes: 1 addition & 8 deletions ...ros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,14 +519,7 @@ instance CardanoHardForkConstraints c
]

supportedNodeToClientVersions _ = Map.fromList $
[ (NodeToClientV_9 , CardanoNodeToClientVersion7)
, (NodeToClientV_10, CardanoNodeToClientVersion7)
, (NodeToClientV_11, CardanoNodeToClientVersion8)
, (NodeToClientV_12, CardanoNodeToClientVersion8)
, (NodeToClientV_13, CardanoNodeToClientVersion9)
, (NodeToClientV_14, CardanoNodeToClientVersion10)
, (NodeToClientV_15, CardanoNodeToClientVersion11)
, (NodeToClientV_16, CardanoNodeToClientVersion12)
[ (NodeToClientV_16, CardanoNodeToClientVersion12)
, (NodeToClientV_17, CardanoNodeToClientVersion13)
, (NodeToClientV_18, CardanoNodeToClientVersion14)
, (NodeToClientV_19, CardanoNodeToClientVersion15)
Expand Down
9 changes: 1 addition & 8 deletions ...onsensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where
, (NodeToNodeV_14, ShelleyNodeToNodeVersion1)
]
supportedNodeToClientVersions _ = Map.fromList [
(NodeToClientV_9, ShelleyNodeToClientVersion5)
, (NodeToClientV_10, ShelleyNodeToClientVersion5)
, (NodeToClientV_11, ShelleyNodeToClientVersion5)
, (NodeToClientV_12, ShelleyNodeToClientVersion5)
, (NodeToClientV_13, ShelleyNodeToClientVersion5)
, (NodeToClientV_14, ShelleyNodeToClientVersion6)
, (NodeToClientV_15, ShelleyNodeToClientVersion7)
, (NodeToClientV_16, ShelleyNodeToClientVersion8)
(NodeToClientV_16, ShelleyNodeToClientVersion8)
, (NodeToClientV_17, ShelleyNodeToClientVersion9)
, (NodeToClientV_18, ShelleyNodeToClientVersion10)
, (NodeToClientV_19, ShelleyNodeToClientVersion11)
Expand Down
3 changes: 3 additions & 0 deletions ouroboros-consensus/changelog.d/20241120_160044_neilmayhew_release_srp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Non-Breaking

- Drop NodeToClient versions < 16.
7 changes: 0 additions & 7 deletions ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ data QueryVersion
-- | Get the @QueryVersion@ supported by this @NodeToClientVersion@.
nodeToClientVersionToQueryVersion :: NodeToClientVersion -> QueryVersion
nodeToClientVersionToQueryVersion x = case x of
NodeToClientV_9 -> QueryVersion1
NodeToClientV_10 -> QueryVersion2
NodeToClientV_11 -> QueryVersion2
NodeToClientV_12 -> QueryVersion2
NodeToClientV_13 -> QueryVersion2
NodeToClientV_14 -> QueryVersion2
NodeToClientV_15 -> QueryVersion2
NodeToClientV_16 -> QueryVersion2
NodeToClientV_17 -> QueryVersion2
NodeToClientV_18 -> QueryVersion2
Expand Down