feat(e2e): simplify the relation between manifest and testnet (backport #3964)#4308
Merged
mergify[bot] merged 2 commits intov1.xfrom Oct 20, 2024
Merged
feat(e2e): simplify the relation between manifest and testnet (backport #3964)#4308mergify[bot] merged 2 commits intov1.xfrom
mergify[bot] merged 2 commits intov1.xfrom
Conversation
Refactors the `e2e` testbed to remove some unnecessary duplication between `Manifest` and `Testnet`, and `ManifestNode` and `Node`. Fields that are identical in the two types are removed from the latter, which includes (extends) the former. Fields that had the same name but different types or semantics in the two versions, were renamed in the manifest. With this change, to add a new field to the configuration of a testnet or a node, it is enough to update the `Manifest` or `ManifestNode`. The new field must also be added to `Testnet` or `Node` if it needs to be somehow parsed (see the examples of the `Seeds` and `PersistentPeers` fields). --- #### PR checklist - [ ] Tests written/updated - [ ] Changelog entry added in `.changelog` (we use [unclog](https://github.com/informalsystems/unclog) to manage our changelog) - [ ] Updated relevant documentation (`docs/` or `spec/`) and code comments --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Andy Nogueira <me@andynogueira.dev> (cherry picked from commit 40c4b40) # Conflicts: # test/e2e/generator/generate.go # test/e2e/pkg/testnet.go
Contributor
Author
|
Cherry-pick of 40c4b40 has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
cason
approved these changes
Oct 20, 2024
cason
left a comment
There was a problem hiding this comment.
Diffs are identical, except for the KeyType introduced in main but not yet present in v1.x.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Refactors the
e2etestbed to remove some unnecessary duplication betweenManifestandTestnet, andManifestNodeandNode. Fields that are identical in the two types are removed from the latter, which includes (extends) the former. Fields that had the same name but different types or semantics in the two versions, were renamed in the manifest.With this change, to add a new field to the configuration of a testnet or a node, it is enough to update the
ManifestorManifestNode. The new field must also be added toTestnetorNodeif it needs to be somehow parsed (see the examples of theSeedsandPersistentPeersfields).PR checklist
.changelog(we use unclog to manage our changelog)docs/orspec/) and code commentsThis is an automatic backport of pull request #3964 done by [Mergify](https://mergify.com).