Skip to content

Integration with ouroboros-network:cardano-diffusion #1570

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.

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

coot
Copy link
Contributor

@coot coot commented Jun 24, 2025

Closes #1527

Description

  • Integration of ouroboros-network:cardano-diffusion
  • SRV support
  • Updated golden files for GetBigledgerPeerSnapshot

Comment on lines 427 to 433
MustExist ->
-- create the file if it doesn't exist
void $
hPut hasFS pHnd $
Put.execPut $
Put.putWord8 currentVersionNumber
<> putSecondaryOffset 0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this right?

@coot coot force-pushed the coot/cardano-diffusion-integration branch from 65e4a5d to b6e8b42 Compare June 24, 2025 19:49
ouroboros-network-protocols
ouroboros-network-testing

source-repository-package
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for an s-r-p on fs-sim, this revision is already on Hackage.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be removed before merging

@coot coot force-pushed the coot/cardano-diffusion-integration branch from b6e8b42 to 24b6918 Compare June 30, 2025 09:19
@geo2a geo2a mentioned this pull request Jun 30, 2025
4 tasks
@coot coot force-pushed the coot/cardano-diffusion-integration branch from 24b6918 to d24a4aa Compare June 30, 2025 15:52
@jasagredo jasagredo moved this to 🏗 In progress in Consensus Team Backlog Jul 2, 2025
Copy link
Contributor

@jasagredo jasagredo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Golden files are out-of-date too.

ouroboros-network-protocols
ouroboros-network-testing

source-repository-package
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be removed before merging

@@ -15,7 +15,6 @@ import qualified Ouroboros.Network.AnchoredFragment as AF
import Ouroboros.Network.Driver.Limits
( ProtocolLimitFailure (ExceededTimeLimit)
)
import Ouroboros.Network.Protocol.ChainSync.Codec (mustReplyTimeout)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised we can delete these imports without deleting any code?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ChainSyncTimeout data type is now defined in Test.Consensus.PointSchedule.

Comment on lines +712 to +713
-- [ canAwaitTimeout cst
-- , intersectTimeout cst
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can be uncommented.

]
)
let
-- cst = gtChainSyncTimeouts gt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above.

@@ -424,6 +424,13 @@ open hasFS@HasFS{hOpen, hClose} chunk allowExisting = do
flip onException (hClose pHnd) $ do
case allowExisting of
AllowExisting -> return ()
MustExist ->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one seems fine as is, and also we never call this function with that argument

@jasagredo
Copy link
Contributor

Also obsoletes #1561

@coot coot force-pushed the coot/cardano-diffusion-integration branch from d24a4aa to ac84a32 Compare July 7, 2025 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 🏗 In progress
Status: In Progress
Development

Successfully merging this pull request may close these issues.

Integrate io-classes-1.8
4 participants