Skip to content

refactor(consensus): print err from SignAndCheckVote (backport #2346)#2441

Merged
melekes merged 2 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-2346
Feb 26, 2024
Merged

refactor(consensus): print err from SignAndCheckVote (backport #2346)#2441
melekes merged 2 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-2346

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2024

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

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

You are currently cherry-picking commit e623c4406.
  (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:   consensus/state.go
	modified:   types/vote.go

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

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


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

Refs #2357

---

#### PR checklist

- [x] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

(cherry picked from commit e623c44)

# Conflicts:
#	types/vote_test.go
@mergify mergify bot requested a review from a team as a code owner February 26, 2024 13:49
@mergify mergify bot added the conflicts label Feb 26, 2024
@melekes melekes merged commit 8cd4a69 into v0.38.x Feb 26, 2024
@melekes melekes deleted the mergify/bp/v0.38.x/pr-2346 branch February 26, 2024 14:38
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.

2 participants