Skip to content

remove unneeded divergence from Canton sources#5480

Open
stephencompall-DA wants to merge 19 commits into
mainfrom
s11/546-undo-unneeded-canton-divergence
Open

remove unneeded divergence from Canton sources#5480
stephencompall-DA wants to merge 19 commits into
mainfrom
s11/546-undo-unneeded-canton-divergence

Conversation

@stephencompall-DA
Copy link
Copy Markdown
Contributor

@stephencompall-DA stephencompall-DA commented May 8, 2026

For DACH-NY/canton#32877, part of #546, there were aspects of CantonConfig/Environment usage where the upstreaming would be far nicer, or in some cases could only be upstream-compatible, with a different approach to our own divergence. So those changes are collected here.

  • remove SharedCantonConfig#name
  • move Environment#createConsole back where it was
  • restore SharedCantonConfig#mergeDynamicChanges
    • restore Environment#pokeOrUpdateConfig
  • some statically empty Maps
  • override startupConfigFileMonitoring to disable instead of just deleting from the fork
  • remove unused environmentFactory addition, which is accessible elsewhere
  • restore TestEnvironment#actualConfig's original implementation
  • use Base* pattern for some generalized classes with type aliases to avoid many, many downstream renames in Canton test code
  • drop unneeded tparam from Runner

Pull Request Checklist

Cluster Testing

  • If a cluster test is required, comment /cluster_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.
  • If a hard-migration test is required (from the latest release), comment /hdm_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.
  • If a logical synchronizer upgrade test is required (from canton-3.5), comment /lsu_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.

PR Guidelines

  • Include any change that might be observable by our partners or affect their deployment in the release notes.
  • Specify fixed issues with Fixes #n, and mention issues worked on using #n
  • Include a screenshot for frontend-related PRs - see README or use your favorite screenshot tool

Merge Guidelines

  • Make the git commit message look sensible when squash-merging on GitHub (most likely: just copy your PR description).

Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
…es that way [skip ci]

Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA stephencompall-DA marked this pull request as ready for review May 22, 2026 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant