Skip to content
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

feat: implements block height check in PrepareProposal to avoid unexpected errors at height 1 (backport #2233) #2423

Merged
merged 2 commits into from
Sep 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 5, 2023

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

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

You are currently cherry-picking commit e2b154d.
  (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:
	modified:   app/prepare_proposal.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   app/test/block_production_test.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

…ected errors at height 1 (#2233)

## Overview
Closes #1899
Closes #2221

## Checklist

- [x] New and updated code has appropriate documentation
- [x] New and updated code has new and/or updated testing
- [x] Required CI checks are passing
- [x] Visual proof for any user facing features like CLI or
documentation updates
- [x] Linked issues closed with keywords

(cherry picked from commit e2b154d)

# Conflicts:
#	app/test/block_production_test.go
@mergify mergify bot added the conflicts label Sep 5, 2023
@github-actions github-actions bot added the bot item was created by a bot label Sep 5, 2023
@celestia-bot celestia-bot requested a review from a team September 5, 2023 01:03
@codecov-commenter
Copy link

Codecov Report

Merging #2423 (15a9d87) into v1.x (6639c1a) will decrease coverage by 0.04%.
Report is 1 commits behind head on v1.x.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             v1.x    #2423      +/-   ##
==========================================
- Coverage   20.52%   20.49%   -0.04%     
==========================================
  Files         138      138              
  Lines       15761    15788      +27     
==========================================
  Hits         3235     3235              
- Misses      12219    12246      +27     
  Partials      307      307              
Files Changed Coverage Δ
app/prepare_proposal.go 0.00% <0.00%> (ø)
test/util/testnode/config.go 0.00% <0.00%> (ø)

@evan-forbes evan-forbes merged commit 2acd0ed into v1.x Sep 10, 2023
21 checks passed
@evan-forbes evan-forbes deleted the mergify/bp/v1.x/pr-2233 branch September 10, 2023 05:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants