Skip to content

e2e: test vote extension activation via InitChain and FinalizeBlock (backport #2066)#2083

Merged
sergio-mena merged 3 commits intov1.xfrom
mergify/bp/v1.x/pr-2066
Jan 22, 2024
Merged

e2e: test vote extension activation via InitChain and FinalizeBlock (backport #2066)#2083
sergio-mena merged 3 commits intov1.xfrom
mergify/bp/v1.x/pr-2066

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 22, 2024

This is an automatic backport of pull request #2066 done by Mergify.
Cherry-pick of eab2355 has failed:

On branch mergify/bp/v1.x/pr-2066
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit eab2355ed.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .changelog/unreleased/improvements/2065-e2e-vote-ext-activation.md
	modified:   test/e2e/app/app.go
	modified:   test/e2e/generator/generate.go
	modified:   test/e2e/networks/ci.toml
	modified:   test/e2e/node/config.go
	modified:   test/e2e/pkg/manifest.go
	modified:   test/e2e/pkg/testnet.go
	modified:   test/e2e/runner/setup.go
	modified:   types/params.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .changelog/unreleased/improvements/1958-disable-linting.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…ock` (#2066)

Closes #2065

This PR introduces a new `e2e` manifest option
`VoteExtensionsUpdateHeight`, which allows the `e2e` application to test
vote extension activation mechanisms other than via genesis file.

The value of `VoteExtensionsUpdateHeight` is interpreted as follows:
* -1: the value of `VoteExtensionsEnableHeight` is to be set in the
genesis file (this is equivalent to the mechanism currently present in
`e2e`)
* 0: the value of `VoteExtensionsEnableHeight` is to be set in
`InitChainResponse`
* _H_ (where _H_ >= `InitialHeight`, and _H_ <
`VoteExtensionsEnableHeight`): the value of `VoteExtensionsEnableHeight`
is set in the `FinalizeBlockResponse` corresponding to height _H_ (i.e.,
at the end of height _H_)

The PR also extends the manifest generator to produce different (valid)
values of the new option `VoteExtensionsUpdateHeight` in combination
with `VoteExtensionsEnableHeight`

---

#### 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

(cherry picked from commit eab2355)

# Conflicts:
#	.changelog/unreleased/improvements/1958-disable-linting.md
@mergify mergify bot requested a review from a team as a code owner January 22, 2024 09:37
@mergify mergify bot requested a review from a team January 22, 2024 09:37
@mergify mergify bot added the conflicts label Jan 22, 2024
…ock` (#2066)

Closes #2065

This PR introduces a new `e2e` manifest option
`VoteExtensionsUpdateHeight`, which allows the `e2e` application to test
vote extension activation mechanisms other than via genesis file.

The value of `VoteExtensionsUpdateHeight` is interpreted as follows:
* -1: the value of `VoteExtensionsEnableHeight` is to be set in the
genesis file (this is equivalent to the mechanism currently present in
`e2e`)
* 0: the value of `VoteExtensionsEnableHeight` is to be set in
`InitChainResponse`
* _H_ (where _H_ >= `InitialHeight`, and _H_ <
`VoteExtensionsEnableHeight`): the value of `VoteExtensionsEnableHeight`
is set in the `FinalizeBlockResponse` corresponding to height _H_ (i.e.,
at the end of height _H_)

The PR also extends the manifest generator to produce different (valid)
values of the new option `VoteExtensionsUpdateHeight` in combination
with `VoteExtensionsEnableHeight`

---

- [ ] 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
@sergio-mena sergio-mena self-assigned this Jan 22, 2024
@sergio-mena sergio-mena merged commit d06afad into v1.x Jan 22, 2024
@sergio-mena sergio-mena deleted the mergify/bp/v1.x/pr-2066 branch January 22, 2024 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant