Skip to content

Add test missing in #1687 (backport #1712)#1759

Merged
lasarojc merged 2 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1712
Dec 6, 2023
Merged

Add test missing in #1687 (backport #1712)#1759
lasarojc merged 2 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1712

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 6, 2023

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

On branch mergify/bp/v0.38.x/pr-1712
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit ce0215c43.
  (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/bug-fixes/1687-consensus-fix-block-validation.md
	modified:   state/execution_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   abci/example/kvstore/kvstore.go

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

* Experimenting the fix from lx-xiang

* Fixes name in the example

* Reverts fix, so it is merged from the proper branch.

* Adds a test that fails because the validate is wrong and accepts a block that is larger than it should.

* Add changelog for the original PR

* Update internal/state/execution_test.go

(cherry picked from commit ce0215c)

# Conflicts:
#	abci/example/kvstore/kvstore.go
@mergify mergify bot requested a review from a team as a code owner December 6, 2023 17:55
@mergify mergify bot added the conflicts label Dec 6, 2023
@lasarojc lasarojc self-assigned this Dec 6, 2023
@lasarojc lasarojc removed the conflicts label Dec 6, 2023
@lasarojc lasarojc merged commit aeb5f68 into v0.38.x Dec 6, 2023
@lasarojc lasarojc deleted the mergify/bp/v0.38.x/pr-1712 branch December 6, 2023 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant