8000 Add test missing in #1687 (backport #1712) by mergify[bot] · Pull Request #1760 · cometbft/cometbft · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 8, 2023

Conversation

mergify[bot]
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.37.x/pr-1712
Your branch is up to date with 'origin/v0.37.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

< 8000 div data-show-on-forbidden-error hidden>

Uh oh!

There was an error while loading. Please reload this page.

@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
Copy link
Contributor
lasarojc commented Dec 6, 2023

We don't mess with the transaction set in the 0.37 version of the app, so this backport does not make sense.

@lasarojc lasarojc closed this Dec 6, 2023
@lasarojc lasarojc deleted the mergify/bp/v0.37.x/pr-1712 branch December 6, 2023 19:03
@lasarojc lasarojc restored the mergify/bp/v0.37.x/pr-1712 branch December 7, 2023 10:06
@lasarojc
Copy link
Contributor
lasarojc commented Dec 7, 2023

Reevaluate.

@lasarojc lasarojc reopened this Dec 7, 2023
@lasarojc
Copy link
Contributor
lasarojc commented Dec 7, 2023

@Mergifyio rebase

* 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
Copy link
Contributor Author
mergify bot commented Dec 7, 2023

rebase

✅ Branch has been successfully rebased

@lasarojc lasarojc force-pushed the mergify/bp/v0.37.x/pr-1712 branch from 69c863f to 772cfd2 Compare December 7, 2023 14:42
@lasarojc lasarojc removed the conflicts label Dec 7, 2023
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
0