Skip to content

Conversation

coot
Copy link
Collaborator

@coot coot commented Sep 22, 2025

Description

  • Moved ouroboros-network-protocols to ouroboros-network
  • Moved ouroboros-network-framework to ouroboros-newtork:framework
  • Moved ouroboros-network-mock to ouroboros-network:mock
  • Reorganised ouroboros-network.cabal file
  • Moved ouroboros-network-testing to ouroboros-network
  • Moved ouroboros-network-api to ouroboros-newtork
  • ouroboros-network:api - moved NodeTo{Node,Client} under Cardano name space
  • ouroboros-network:api-tests - moved NodeTo{Client,Node}.Version tests
  • ouroboros-network:api-tests - moved Test.Cardano.Network.Version
  • ouroboros-network:mock - moved its last module to protocols-tests-lib
  • cardano-diffusion package
  • peer-selection: reorganised exports
  • Updated nix & GHA
  • Added changelog
  • Updated network-spec

Checklist

Quality

  • Commit sequence makes sense and have useful messages, see ref.
  • New tests are added and existing tests are updated.
  • Self-reviewed the PR.

Maintenance

  • Linked an issue or added the PR to the current sprint of ouroboros-network project.
  • Added labels.
  • Updated changelog files.
  • The documentation has been properly updated, see ref.

Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@coot coot force-pushed the coot/packages branch 4 times, most recently from 55256cd to e6d5962 Compare September 29, 2025 12:47
@coot coot requested a review from Copilot September 29, 2025 12:54
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@coot coot force-pushed the coot/packages branch 2 times, most recently from c6a5a1e to d18af16 Compare October 1, 2025 10:26
@crocodile-dentist
Copy link
Contributor

crocodile-dentist commented Oct 6, 2025

Can we remove the commit sim-net: removed duplicate traces. When debugging I want to have the flexibility to just enable the say tracer of interest and really cut down on the noise, but with this change it will be all or nothing. The node tracer is iosimTracer and in fact I comment out the second term:

-- | A debug tracer which embeds events in DiffusionTestTrace.
--
iosimTracer :: forall s.
               Tracer (IOSim s) (WithTime (WithName NtNAddr DiffusionTestTrace))
iosimTracer =
     Tracer traceM
--  <> Tracer (\WithTime { wtEvent = WithName { wnName, wnEvent } } ->
--              -- don't log time, it's in the trace
--              say $ ppNtNAddr wnName ++ " @ " ++ ppDiffusionTestTrace wnEvent)

[edit] to avoid the issue of double trace output, maybe we can switch our counterexamples:

-    $ counterexample (Trace.ppTrace show (ppSimEvent 0 0 0) $ Trace.take traceNumber trace)
+    $ counterexample (List.intercalate "\n" $
+        selectTraceEventsSay' $ Trace.take traceNumber trace)

@crocodile-dentist
Copy link
Contributor

The commit Removed DuplicateRecordFields extension can instead enable the extension DisambiguateRecordFields and we won't have to prefix every field of a record with the module it's from (eg. IG, or Diffusion, and maybe some others as well).

Copy link
Contributor

@crocodile-dentist crocodile-dentist left a comment

Choose a reason for hiding this comment

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

just one comment and one request

@coot
Copy link
Collaborator Author

coot commented Oct 7, 2025

Can we remove the commit sim-net: removed duplicate traces. When debugging I want to have the flexibility to just enable the say tracer of interest and really cut down on the noise, but with this change it will be all or nothing. The node tracer is iosimTracer and in fact I comment out the second term:

Good point, I'll drop this commit from this PR.

@coot coot mentioned this pull request Oct 7, 2025
7 tasks
@coot coot force-pushed the coot/packages branch 2 times, most recently from 879eed1 to 2c46e60 Compare October 14, 2025 16:00
coot added 4 commits October 15, 2025 12:02
They were moved to `ouroboros-network:cardano-diffusion` in a previous
PR.
* `ouroboros-network-protocols`         -> `ouroboros-network:protocols` in `protocols/lib`
* `ouroboros-network-protocols:testlib` -> `ouroboros-network:protocols-tests-lib` in `protocols/tests-lib`
* `ouroboros-network-protocols:test`    -> `ouroboros-network:protocols-tests` in `protocols/tests`
* `ouroboros-network-protocols:bench`   -> `ouroboros-network:protocols-bench` in `protocols/bench`
* `ouroboros-network-framework`                         -> `ouroboros-network:framework`           in `framework/lib`
* `ouroboros-network-framework:testlib`                 -> `ouroboros-network:framework-tests-lib` in `framework/tests-lib`
* `ouroboros-network-framework:sim-tests`               -> `ouroboros-network:framework-sim-tests` in `framework/sim-tests`
* `ouroboros-network-framework:io-tests`                -> `ouroboros-network:framework-io-tests`  in `framework/io-tests`
* `ouroboros-network-framework:demo-connection-manager` -> `ouroboros-network:demo-connection-manager` in `demo`
* `ouroboros-network-framework:demo-ping-pong`          -> `ouroboros-network:demo-ping-pong`          in `demo`
* `ouroboros-newtork-mock` -> `ouroboros-network:mock` in `mock`
coot added 8 commits October 15, 2025 12:02
ouroboros-network tests moved / renamed:
* `ouroboros-network:testlib`   -> `ouroboros-network:ouroboros-network-tests-lib` in `tests/lib`
* `ouroboros-network:sim-tests` -> `ouroboros-network:ouroboros-network-sim-tests` in `tests/sim`
* `ouroboros-network:io-tests`  -> `ouroboros-network:ouroboros-network-io-tests`  in `tests/io`
* `ouroboros-network-testing`      -> `ouroboros-network:tests-lib` in `tests-lib/lib`
* `ouroboros-network-testing:test` -> `ouroboros-network:tests-lib` in `tests-lib/tests`
* `ouroboros-network-api`                         -> `ouroboros-network:api`       in `ouroboros-network/api/lib`
* `ouroboros-network-api:test`                    -> `ouroboros-network:api-tests` in `ouroboros-network/api/tests`
* `ouroboros-network-api:bench-anchored-fragment` -> `ouroboros-network:api-bench` in `ouroboros-network/api/bench`
Introduced `cardano-diffusion` package.

Some things are hidden inside of it because that's how we are testing
things now, in particular `PeerSelection` and `Testnet` tests depend on
`Cardano` constructs.  In the future we could split them into general
test & cardano specific tests, this will be in particularly useful for
another non-trivial extension of `ouroboros-network`, but also might
organise tests better.
coot and others added 12 commits October 15, 2025 12:08
Expanded `Ouroboros.Network.PeerSelection` module to simplify imports in
downstream libraries.
Added `Cardano.Network.PeerSelection` which re-export useful cardano
peer selection APIs.
* refactored `requireBootstrapPeers`
* `unit_peer_sharing`: refactored to get debug output easier
* labelled inbound governor state var
This is inline with other testing component in `ouroboros-network`
repository.
We don't need to disambiguate record fields anymore.
It is a left over after merging tx-submission logic.  The module was
moved to `Ouroboros.Network.TxSubmission.Inbound.V1`.
@coot coot added this pull request to the merge queue Oct 16, 2025
Merged via the queue into main with commit 22cb6fb Oct 16, 2025
15 of 16 checks passed
@coot coot deleted the coot/packages branch October 16, 2025 11:25
@github-project-automation github-project-automation bot moved this from In Progress to Done in Ouroboros Network Oct 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants